https://jira.jboss.org/jira/browse/JBDS-821 -Updated Quick Start section= according to the new design and functionality of the Smooks-tools.

Mapping = @@ -296,7 +417,7 @@ = Make sense? - You should right click Resource List , select + You should open Design tab and click Add button. In opened Add Child Wi= zard,please, select Add Smooks Resource>Java Binding>Bindings. = First of all, you should bind --===============2532397884719650052==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 09:21:22 2009 Content-Type: multipart/mixed; boundary="===============4952438669594681675==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17545 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project. Date: Mon, 14 Sep 2009 09:21:17 -0400 Message-ID: <200909141321.n8EDLHHX012569@svn01.web.mwc.hst.phx2.redhat.com> --===============4952438669594681675== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-14 09:21:17 -0400 (Mon, 14 Sep 2009) New Revision: 17545 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/project/ImportProjectFoldersPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-3506 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/project/ImportProjectFoldersPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/project/ImportProjectFoldersPage.java 2009-09-14 12:49:56 UTC (rev 1754= 4) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/project/ImportProjectFoldersPage.java 2009-09-14 13:21:17 UTC (rev 1754= 5) @@ -79,8 +79,10 @@ XAttributeData[] ad =3D entityData.getAttributeData(); for (int i =3D 0; i < ad.length; i++) ad[i].setValue(""); //$NON-NLS-1$ = - context.setServletVersion(JSFPreference.DEFAULT_JSF_IMPORT_SERVLET_VERSI= ON.getValue()); - = + if(context.getServletVersion() =3D=3D null) { + context.setServletVersion(JSFPreference.DEFAULT_JSF_IMPORT_SERVLET_VERS= ION.getValue()); + } + = JSFTemplate t =3D new JSFTemplate(); String[] versions =3D t.getVersionList(); HUtil.hackAttributeConstraintList(new XEntityData[]{entityData}, 0, ATTR= IBUTES[3], versions); @@ -254,5 +256,5 @@ FieldEditor f =3D support.getFieldEditorByName("version"); //$NON-NLS-1$ f.setEnabled(b, supportControl); = } - = + } --===============4952438669594681675==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 09:49:47 2009 Content-Type: multipart/mixed; boundary="===============8637856813248669697==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17546 - trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/csvparser. Date: Mon, 14 Sep 2009 09:49:47 -0400 Message-ID: <200909141349.n8EDnlPF016914@svn01.web.mwc.hst.phx2.redhat.com> --===============8637856813248669697== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: DartPeng Date: 2009-09-14 09:49:46 -0400 (Mon, 14 Sep 2009) New Revision: 17546 Modified: trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/= smooks/test/csvparser/CsvParserTest.java Log: JBIDE-4878 Change the unit test case Modified: trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss= /tools/smooks/test/csvparser/CsvParserTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools= /smooks/test/csvparser/CsvParserTest.java 2009-09-14 13:21:17 UTC (rev 1754= 5) +++ trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools= /smooks/test/csvparser/CsvParserTest.java 2009-09-14 13:49:46 UTC (rev 1754= 6) @@ -101,11 +101,11 @@ IXMLStructuredObject child =3D tag.getChildren().get(0); assertEquals("csv-record", child.getNodeName()); = - checkNode("a",tag); - checkNode("b",tag); - checkNode("c",tag); - checkNode("d",tag); - checkNode("e",tag); + checkNode("firstname",tag); + checkNode("lastname",tag); + checkNode("gender",tag); + checkNode("age",tag); + checkNode("country",tag); } = private void checkTagList1(TagList tagList){ --===============8637856813248669697==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 11:06:25 2009 Content-Type: multipart/mixed; boundary="===============6059433639820331910==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17547 - in trunk/maven/plugins: org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet and 1 other directory. Date: Mon, 14 Sep 2009 11:06:25 -0400 Message-ID: <200909141506.n8EF6Pxb030543@svn01.web.mwc.hst.phx2.redhat.com> --===============6059433639820331910== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2009-09-14 11:06:24 -0400 (Mon, 14 Sep 2009) New Revision: 17547 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven= /core/libprov/MavenLibraryProviderInstallOperation.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/u= i/internal/project/facet/MavenFacetInstallPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4881 Maven Library Provider doesn'= t save correctly changes made by a user Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tool= s/maven/core/libprov/MavenLibraryProviderInstallOperation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/mave= n/core/libprov/MavenLibraryProviderInstallOperation.java 2009-09-14 13:49:4= 6 UTC (rev 17546) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/mave= n/core/libprov/MavenLibraryProviderInstallOperation.java 2009-09-14 15:06:2= 4 UTC (rev 17547) @@ -58,14 +58,11 @@ URIConverter.WriteableOutputStream uws =3D null; FileWriter fw =3D null; try { - if (providerFile.exists()) { - url =3D providerFile.toURL(); - } else { - Map params =3D provider.getParams(); - String pomURLString =3D params.get("template"); //$NON-NLS-1$ - URL platformURL =3D new URL(pomURLString); - url =3D FileLocator.resolve(platformURL); - } + Map params =3D provider.getParams(); + String pomURLString =3D params.get("template"); //$NON-NLS-1$ + URL platformURL =3D new URL(pomURLString); + url =3D FileLocator.resolve(platformURL); + = libraryResource =3D MavenCoreActivator.loadResource(url); libraryResource.getContents().clear(); libraryResource.getContents().add(libraryModel); @@ -84,12 +81,16 @@ try { uws.flush(); uws.close(); - } catch (IOException ignore) {} + } catch (IOException e) { + MavenCoreActivator.log(e); + } } if (fw !=3D null) { try { fw.close(); - } catch (IOException ignore) {} + } catch (IOException e) { + MavenCoreActivator.log(e); + } } if (libraryResource !=3D null) { libraryResource.unload(); Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/= maven/ui/internal/project/facet/MavenFacetInstallPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/= ui/internal/project/facet/MavenFacetInstallPage.java 2009-09-14 13:49:46 UT= C (rev 17546) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/= ui/internal/project/facet/MavenFacetInstallPage.java 2009-09-14 15:06:24 UT= C (rev 17547) @@ -67,7 +67,10 @@ composite.setLayoutData(gd); = String projectName =3D getDataModel().getStringProperty(IFacetProjectCre= ationDataModelProperties.FACET_PROJECT_NAME); - IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject= (projectName); + IProject project =3D null; + if (projectName !=3D null && projectName.trim().length() > 0) { + project =3D ResourcesPlugin.getWorkspace().getRoot().getProject(project= Name); + } boolean mavenProjectExists =3D false; if (project !=3D null && project.isOpen()) { try { --===============6059433639820331910==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 12:17:42 2009 Content-Type: multipart/mixed; boundary="===============4336600847026990973==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17548 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences and 8 other directories. Date: Mon, 14 Sep 2009 12:17:42 -0400 Message-ID: <200909141617.n8EGHgPb013490@svn01.web.mwc.hst.phx2.redhat.com> --===============4336600847026990973== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2009-09-14 12:17:42 -0400 (Mon, 14 Sep 2009) New Revision: 17548 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/pr= eferences/IVpePreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pre= ferences/SliderFieldEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pre= ferences/VpeComboFieldEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pre= ferences/VpePreferencesPage.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/JSPMultiPageEditor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/JSPTextEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= EditorPart.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= VisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bun= dle/BundleMap.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pre= ferences/VpeEditorPreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem= plate/VpeAnyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl= /CustomSashForm.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl= /EditorSettings.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl= /SashSetting.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/V= peUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/Sel= ectionBar.java Log: https://jira.jboss.org/jira/browse/JBIDE-4671, VPE Preference Page was rema= de. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/JSPMultiPageEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPMultiPageEditor.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPMultiPageEditor.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ = + *************************************************************************= *****/ package org.jboss.tools.jst.jsp.jspeditor; = import java.util.Properties; @@ -79,7 +79,7 @@ import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.editor.IVisualEditor; import org.jboss.tools.jst.jsp.editor.IVisualEditorFactory; -import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; = @@ -88,20 +88,13 @@ XModelTreeListener, ITextEditor, IGotoMarker, VpeTaglibManagerProvider, IReusableEditor, ITextEditorExtension, ITextEditorExtension2, ITextEditorExtension3, INavigationLocationProvider, IMultiPageEditor { - = + public static final String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jspedit= or.JSPTextEditor"; //$NON-NLS-1$ - = - //option loads preview tab - private static final String PREVIEW_TAB=3D"Preview"; //$NON-NLS-1$ - //visual tab - private static final String VISUAL_SOURCE_TAB=3D"Visual/Source"; //$NON-N= LS-1$ - = - private static final String VPE_VISUAL_EDITOR_IMPL_ID=3D"org.jboss.tools.= vpe.org.jboss.tools.vpe.editor.VpeEditorPartFactory"; //$NON-NLS-1$ - //source tab - private static final String SOURCE_TAB=3D"Source"; //$NON-NLS-1$ - = - private static final String VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME=3D"vi= sulaEditorImplementations"; //$NON-NLS-1$ = + private static final String VPE_VISUAL_EDITOR_IMPL_ID =3D "org.jboss.tool= s.vpe.org.jboss.tools.vpe.editor.VpeEditorPartFactory"; //$NON-NLS-1$ + + private static final String VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME =3D "= visulaEditorImplementations"; //$NON-NLS-1$ + private IVisualEditor visualEditor; = private int visualSourceIndex; @@ -109,19 +102,19 @@ private JSPTextEditor sourceEditor; = private int sourceIndex; - = + /** composite control for default web-browser */ - //private IVisualEditor previewWebBrowser; - = + // private IVisualEditor previewWebBrowser; + /** index of tab contain default web-browser */ private int previewIndex; = -// private boolean osWindows =3D true; + // private boolean osWindows =3D true; = protected XModelTreeListenerSWTSync syncListener =3D new XModelTreeListen= erSWTSync( this); = -// private int oldPage =3D -1; + // private int oldPage =3D -1; = private ConfigurableContentOutlinePage outlinePage =3D null; = @@ -135,7 +128,7 @@ static IVisualEditorFactory visualEditorFactory; = static { - //Fix For JBIDE-2674 + // Fix For JBIDE-2674 try { IExtension visualEditorExtension =3D Platform.getExtensionRegistry() .getExtension(JspEditorPlugin.PLUGIN_ID, @@ -165,47 +158,23 @@ } = private void loadSelectedTab() { - IFile file =3D getFile(); - try { - String q =3D (file =3D=3D null) ? null : file.getPersistentProperty(per= sistentTabQualifiedName); - if (q =3D=3D null) { - if (VISUAL_SOURCE_TAB.equalsIgnoreCase(VpePreference.EDITOR_VIEW_OPTION - .getValue())) - selectedPageIndex =3D 0; - else if (SOURCE_TAB - .equalsIgnoreCase(VpePreference.EDITOR_VIEW_OPTION - .getValue())) - selectedPageIndex =3D 1; - else if (PREVIEW_TAB - .equalsIgnoreCase(VpePreference.EDITOR_VIEW_OPTION - .getValue())) - selectedPageIndex =3D 2; - else - selectedPageIndex =3D 0; - } else { - int qi =3D Integer.parseInt(q); - = - if (qi >=3D 0 && qi < getTabFolder().getItemCount()) - selectedPageIndex =3D qi; - } - - } catch (CoreException e) { - JspEditorPlugin.getPluginLog().logError(e); + String defaultVpeTab =3D JspEditorPlugin.getDefault() + .getPreferenceStore().getString( + IVpePreferencesPage.DEFAULT_VPE_TAB); + if (IVpePreferencesPage.DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE + .equalsIgnoreCase(defaultVpeTab)) { selectedPageIndex =3D 0; + } else if (IVpePreferencesPage.DEFAULT_VPE_TAB_SOURCE_VALUE + .equalsIgnoreCase(defaultVpeTab)) { + selectedPageIndex =3D 1; + } else if (IVpePreferencesPage.DEFAULT_VPE_TAB_PREVIEW_VALUE + .equalsIgnoreCase(defaultVpeTab)) { + selectedPageIndex =3D 2; + } else { + selectedPageIndex =3D 0; } } = - private void saveSelectedTab() { - IFile file =3D getFile(); - if(file =3D=3D null || !file.exists()) return; - String q =3D "" + selectedPageIndex; //$NON-NLS-1$ - try { - file.setPersistentProperty(persistentTabQualifiedName, q); - } catch (CoreException e) { - JspEditorPlugin.getPluginLog().logWarning(e); - } - } - public void superPageChange(int newPageIndex) { Control control =3D getControl(visualSourceIndex); if (control !=3D null) { @@ -232,28 +201,27 @@ } } = - protected void pageChange(int newPageIndex) { + public void pageChange(int newPageIndex) { selectedPageIndex =3D newPageIndex; - if(visualEditor!=3Dnull) { - if (newPageIndex =3D=3D visualSourceIndex) { - if (visualEditor.getVisualEditor() =3D=3D null) { - visualEditor.createVisualEditor(); - } - visualEditor.setVisualMode(IVisualEditor.VISUALSOURCE_MODE); - = - }else if (newPageIndex =3D=3D sourceIndex) - visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE); - else if (newPageIndex =3D=3D previewIndex) { - if (visualEditor.getPreviewWebBrowser() =3D=3D null) { - visualEditor.createPreviewBrowser(); - } - visualEditor.setVisualMode(IVisualEditor.PREVIEW_MODE); = + if (visualEditor !=3D null) { + if (newPageIndex =3D=3D visualSourceIndex) { + if (visualEditor.getVisualEditor() =3D=3D null) { + visualEditor.createVisualEditor(); } - } = + visualEditor.setVisualMode(IVisualEditor.VISUALSOURCE_MODE); + } else if (newPageIndex =3D=3D sourceIndex) + visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE); + else if (newPageIndex =3D=3D previewIndex) { + if (visualEditor.getPreviewWebBrowser() =3D=3D null) { + visualEditor.createPreviewBrowser(); + } + visualEditor.setVisualMode(IVisualEditor.PREVIEW_MODE); + } + } superPageChange(newPageIndex); - = + } - = + public void setInput(IEditorInput input) { super.setInput(XModelObjectEditorInput.checkInput(input)); if (getEditorInput() instanceof IModelObjectEditorInput) { @@ -264,10 +232,9 @@ && sourceEditor.getEditorInput() !=3D getEditorInput() && sourceEditor.getEditorInput() !=3D null) { if (sourceEditor instanceof AbstractTextEditor) { - ((AbstractTextEditor) sourceEditor) - .setInput(getEditorInput()); + ((AbstractTextEditor) sourceEditor).setInput(getEditorInput()); } - if(visualEditor!=3Dnull) { + if (visualEditor !=3D null) { visualEditor.setInput(getEditorInput()); } updateTitle(); @@ -277,7 +244,8 @@ = private void updateFile() { IFile file =3D getFile(); - if (file =3D=3D null) return; + if (file =3D=3D null) + return; try { file.refreshLocal(0, null); } catch (CoreException e) { @@ -299,11 +267,11 @@ * = */ private ISelectionProvider selectionProvider =3D null; - - private JSPMultiPageEditorSite site; = + private JSPMultiPageEditorSite site; + protected IEditorSite createSite(IEditorPart editor) { - site =3D new JSPMultiPageEditorSite(this, editor) { + site =3D new JSPMultiPageEditorSite(this, editor) { private ISelectionChangedListener postSelectionChangedListener =3D null; = private ISelectionChangedListener getPostSelectionChangedListener() { @@ -333,7 +301,7 @@ } = public String getId() { - return getSite().getId(); = + return getSite().getId(); } = /** @@ -373,21 +341,21 @@ } } = - - public void dispose() { - ISelectionProvider provider =3D getSelectionProvider(); + public void dispose() { + ISelectionProvider provider =3D getSelectionProvider(); if (provider !=3D null) { provider .removeSelectionChangedListener(getSelectionChangedListener()); - } - if (provider instanceof IPostSelectionProvider && postSelectionChanged= Listener !=3D null) { - ((IPostSelectionProvider) provider) - .removePostSelectionChangedListener(postSelectionChangedListener); - = - } - postSelectionChangedListener =3D null; - super.dispose(); - } + } + if (provider instanceof IPostSelectionProvider + && postSelectionChangedListener !=3D null) { + ((IPostSelectionProvider) provider) + .removePostSelectionChangedListener(postSelectionChangedListener); + + } + postSelectionChangedListener =3D null; + super.dispose(); + } }; return site; } @@ -402,51 +370,51 @@ createPagesForVPE(); loadSelectedTab(); = -// if (selectedPageIndex =3D=3D sourceIndex) { -// visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE); -// // switchOutlineToJSPEditor(); -// } -// if (selectedPageIndex =3D=3D 2) { -// setActivePage(0); -// pageChange(0); -// if (visualEditor !=3D null) -// visualEditor.maximizeSource(); -// selectedPageIndex=3D0; -// } else if (selectedPageIndex =3D=3D 1) { -// setActivePage(0); -// pageChange(0); -// if (visualEditor !=3D null) -// visualEditor.maximizeVisual(); -// selectedPageIndex=3D0; -// } else { -// selectedPageIndex=3D0; -// setActivePage(selectedPageIndex); -// pageChange(selectedPageIndex); -// } + // if (selectedPageIndex =3D=3D sourceIndex) { + // visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE); + // // switchOutlineToJSPEditor(); + // } + // if (selectedPageIndex =3D=3D 2) { + // setActivePage(0); + // pageChange(0); + // if (visualEditor !=3D null) + // visualEditor.maximizeSource(); + // selectedPageIndex=3D0; + // } else if (selectedPageIndex =3D=3D 1) { + // setActivePage(0); + // pageChange(0); + // if (visualEditor !=3D null) + // visualEditor.maximizeVisual(); + // selectedPageIndex=3D0; + // } else { + // selectedPageIndex=3D0; + // setActivePage(selectedPageIndex); + // pageChange(selectedPageIndex); + // } switch (selectedPageIndex) { - = + case 0: { - //source/visual mode + // source/visual mode setActivePage(selectedPageIndex); pageChange(selectedPageIndex); break; - } + } case 1: { - //source mode + // source mode setActivePage(selectedPageIndex); pageChange(selectedPageIndex); break; - } + } case 2: { - //preview mode - setActivePage(selectedPageIndex); - pageChange(selectedPageIndex); - break; + // preview mode + setActivePage(selectedPageIndex); + pageChange(selectedPageIndex); + break; } default: { - //by default we sets source/visual mode = + // by default we sets source/visual mode setActivePage(0); - pageChange(0); = + pageChange(0); break; } } @@ -458,31 +426,32 @@ = private void createPagesForVPE() { sourceEditor =3D new JSPTextEditor(this); - if(visualEditorFactory!=3Dnull) { + if (visualEditorFactory !=3D null) { visualEditor =3D visualEditorFactory.createVisualEditor(this, sourceEditor, false); } try { - if(visualEditor!=3Dnull) { + if (visualEditor !=3D null) { visualSourceIndex =3D addPage(visualEditor, getEditorInput()); - setPageText(visualSourceIndex, JSPEditorMessages.JSPMultiPageEditor_Ta= bLabel_VisualSource); = + setPageText( + visualSourceIndex, + JSPEditorMessages.JSPMultiPageEditor_TabLabel_VisualSource); setPartName(visualEditor.getTitle()); } } catch (PartInitException e) { JspEditorPlugin.getPluginLog().logError(e); } - /*try { - visualIndex =3D addPage(visualEditor, getEditorInput()); - setPageText(visualIndex, JSPEditorMessages - .getString(VISUAL_TAB_LABEL)); - setPartName(visualEditor.getTitle()); - } catch (PartInitException e) { - JspEditorPlugin.getPluginLog().logError(e); - }*/ + /* + * try { visualIndex =3D addPage(visualEditor, getEditorInput()); + * setPageText(visualIndex, JSPEditorMessages + * .getString(VISUAL_TAB_LABEL)); setPartName(visualEditor.getTitle()); + * } catch (PartInitException e) { + * JspEditorPlugin.getPluginLog().logError(e); } + */ = try { - String sourceTabLabel =3D JSPEditorMessages.JSPMultiPageEditor_TabLabel= _Source; = - if(visualEditor!=3Dnull) { + String sourceTabLabel =3D JSPEditorMessages.JSPMultiPageEditor_TabLabel= _Source; + if (visualEditor !=3D null) { sourceIndex =3D addPage(visualEditor, getEditorInput()); setPageText(sourceIndex, sourceTabLabel); setPartName(visualEditor.getTitle()); @@ -497,9 +466,10 @@ = // Add tab contain default web-browser try { - if(visualEditor!=3Dnull) { + if (visualEditor !=3D null) { previewIndex =3D addPage(visualEditor, getEditorInput()); - setPageText(previewIndex, JSPEditorMessages.JSPMultiPageEditor_TabLabe= l_Preview); = + setPageText(previewIndex, + JSPEditorMessages.JSPMultiPageEditor_TabLabel_Preview); setPartName(visualEditor.getTitle()); } } catch (PartInitException e) { @@ -530,7 +500,7 @@ sourceEditor.addPropertyListener(pcl); sourceEditor.doSaveAs(); sourceEditor.removePropertyListener(pcl); - try { = + try { if (old.isModified()) new DiscardFileHandler().executeHandler(old, new Properties()); } catch (XModelException e) { @@ -539,8 +509,8 @@ } = public void gotoMarker(final IMarker marker) { - //setActivePage(IVisualEditor.VISUALSOURCE_MODE); - //pageChange(IVisualEditor.VISUALSOURCE_MODE); + // setActivePage(IVisualEditor.VISUALSOURCE_MODE); + // pageChange(IVisualEditor.VISUALSOURCE_MODE); setActivePage(IVisualEditor.SOURCE_MODE); pageChange(IVisualEditor.SOURCE_MODE); IGotoMarker adapter =3D (IGotoMarker) sourceEditor @@ -575,7 +545,6 @@ } = public void dispose() { - saveSelectedTab(); IEditorActionBarContributor contributor =3D getEditorSite() .getActionBarContributor(); if (contributor !=3D null @@ -583,18 +552,18 @@ ((MultiPageEditorActionBarContributor) contributor) .setActivePage(null); } - if(visualEditor!=3Dnull) { + if (visualEditor !=3D null) { visualEditor.dispose(); } - site.dispose(); + site.dispose(); outlinePage =3D null; XModelObject o =3D getModelObject(); if (o !=3D null) { o.getModel().removeModelTreeListener(syncListener); } - if (syncListener !=3D null) - syncListener.dispose(); - syncListener=3Dnull; + if (syncListener !=3D null) + syncListener.dispose(); + syncListener =3D null; if (o !=3D null && o.isModified() && o.isActive()) { try { ((FolderImpl) o.getParent()).discardChildFile(o); @@ -607,14 +576,14 @@ = public Object getAdapter(Class adapter) { if (IContentOutlinePage.class.equals(adapter)) { - = - if (visualEditor !=3D null) { + + if (visualEditor !=3D null) { if (outlinePage =3D=3D null) outlinePage =3D (ConfigurableContentOutlinePage) visualEditor .getAdapter(adapter); return outlinePage; } - = + } else if (IPropertySheetPage.class.equals(adapter)) { if (sourceEditor !=3D null) return sourceEditor.getAdapter(adapter); @@ -703,10 +672,10 @@ } = public VpeTaglibManager getTaglibManager() { - if(sourceEditor!=3Dnull) { - if(sourceEditor.getPageContext() instanceof VpeTaglibManager) - = - return (VpeTaglibManager)sourceEditor.getPageContext(); + if (sourceEditor !=3D null) { + if (sourceEditor.getPageContext() instanceof VpeTaglibManager) + + return (VpeTaglibManager) sourceEditor.getPageContext(); } return null; } @@ -793,6 +762,19 @@ } return null; } + = + public void updatePartAccordingToPreferences() { + String tabIndex =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.DEFAULT_VPE_TAB); + try { + int ind =3D Integer.parseInt(tabIndex); + getTabFolder().setSelection(ind); + pageChange(ind); + } catch (NumberFormatException e) { + JspEditorPlugin.getPluginLog().logError(e); + } + } + = } = class ResourceChangeListener implements IResourceChangeListener { @@ -850,8 +832,8 @@ if (e.getJspEditor() !=3D null && e.getJspEditor().getEditorInput() !=3D e .getEditorInput()) { - ((AbstractTextEditor) e.getJspEditor()) - .setInput(e2); + ((AbstractTextEditor) e.getJspEditor()) + .setInput(e2); } ((XModelObjectEditorInput) ei).synchronize(); } @@ -911,4 +893,5 @@ } return null; } + = } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/JSPTextEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPTextEditor.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPTextEditor.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -128,7 +128,7 @@ import org.jboss.tools.jst.jsp.outline.JSPContentOutlineConfiguration; import org.jboss.tools.jst.jsp.outline.JSPPropertySheetConfiguration; import org.jboss.tools.jst.jsp.outline.ValueHelper; -import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.jsp.text.xpl.IStructuredTextOccurrenceStructure= Provider; import org.jboss.tools.jst.jsp.text.xpl.StructuredTextOccurrenceStructureP= roviderRegistry; import org.jboss.tools.jst.jsp.ui.action.ExtendedFormatAction; @@ -743,9 +743,8 @@ .getDropCommand(flavor, JSPTagProposalFactory.getInstance()); = - boolean promptAttributes =3D "yes" //$NON-NLS-1$ - .equals(VpePreference.ALWAYS_REQUEST_FOR_ATTRIBUTE - .getValue()); + boolean promptAttributes =3D JspEditorPlugin.getDefault().getPreferen= ceStore().getBoolean( + IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT); dropCommand .getDefaultModel() .setPromptForTagAttributesRequired(promptAttributes); Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/preferences/IVpePreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/IVpePreferencesPage.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/IVpePreferencesPage.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -0,0 +1,34 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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.jsp.preferences; + +public interface IVpePreferencesPage { + + static final String SHOW_BORDER_FOR_UNKNOWN_TAGS =3D "Show Border for Unk= nown Tags"; //$NON-NLS-1$ + static final String SHOW_NON_VISUAL_TAGS =3D "Show non-visual tags"; //$N= ON-NLS-1$ + static final String SHOW_SELECTION_TAG_BAR =3D "Show Selection Tag Bar"; = //$NON-NLS-1$ + static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL =3D "Show Resource = Bundles Usage as EL Expressions"; //$NON-NLS-1$ + static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT =3D "Ask for tag att= ributes during tag insert"; //$NON-NLS-1$ + static final String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR =3D "Ask fo= r confirmation when closing Selection Bar"; //$NON-NLS-1$ + static final String DEFAULT_VPE_TAB =3D "Default VPE Tab"; //$NON-NLS-1$ + static final String VISUAL_SOURCE_EDITORS_SPLITTING =3D "Visual/Source Ed= itors Splitting"; //$NON-NLS-1$ + static final String VISUAL_SOURCE_EDITORS_WEIGHTS =3D "Size of Visual Edi= tor Pane 0-100%"; //$NON-NLS-1$ + = + static final String DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE =3D "0"; //$NON-N= LS-1$ + static final String DEFAULT_VPE_TAB_SOURCE_VALUE =3D "1"; //$NON-NLS-1$ + static final String DEFAULT_VPE_TAB_PREVIEW_VALUE =3D "2"; //$NON-NLS-1$ + = + static final String SPLITTING_VERT_TOP_SOURCE_VALUE =3D "1"; //$NON-NLS-1$ + static final String SPLITTING_VERT_TOP_VISUAL_VALUE =3D "2"; //$NON-NLS-1$ + static final String SPLITTING_HORIZ_LEFT_SOURCE_VALUE =3D "3"; //$NON-NLS= -1$ + static final String SPLITTING_HORIZ_LEFT_VISUAL_VALUE =3D "4"; //$NON-NLS= -1$ + = +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jbos= s/tools/jst/jsp/preferences/IVpePreferencesPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeEditorPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -10,9 +10,6 @@ *************************************************************************= *****/ package org.jboss.tools.vpe.editor; = -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import org.eclipse.compare.Splitter; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -20,7 +17,6 @@ import org.eclipse.core.commands.IHandler; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.QualifiedName; import org.eclipse.jface.action.IAction; @@ -78,8 +74,10 @@ import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.common.model.ui.util.ModelUtilities; +import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.editor.IVisualEditor; import org.jboss.tools.jst.jsp.jspeditor.StorageRevisionEditorInputAdapter; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.vpe.IVpeHelpContextIds; import org.jboss.tools.vpe.VpePlugin; @@ -100,6 +98,7 @@ private IHandlerActivation sourceActivation,visualActivation, jumpingActi= vation; private IHandler sourceMaxmin,visualMaxmin, jumping; private Composite cmpEd; + private Composite cmpEdTl; private CustomSashForm container; protected EditorSettings editorSettings; private StructuredTextEditor sourceEditor =3D null; @@ -355,23 +354,6 @@ return sizes; } = - protected void saveSplitterPosition(int[] weights) { - IEditorInput input =3D getEditorInput(); - if (!(input instanceof IFileEditorInput)) - return; - IFile file =3D ((IFileEditorInput) input).getFile(); - try { - String s =3D String.valueOf(weights[0]); - file.setPersistentProperty(SPLITTER_POSITION_KEY1, s); - s =3D String.valueOf(weights[1]); - file.setPersistentProperty(SPLITTER_POSITION_KEY2, s); - s =3D String.valueOf(weights[2]); - file.setPersistentProperty(SPLITTER_POSITION_KEY3, s); - } catch (CoreException e) { - VpePlugin.getPluginLog().logError(e); - } - } - public void setVisualMode(int type) { switch (type) { case VISUALSOURCE_MODE: @@ -503,7 +485,7 @@ /* * Container composite for editor part */ - Composite cmpEdTl =3D new Composite(parent, SWT.NONE); + cmpEdTl =3D new Composite(parent, SWT.NONE); GridLayout layoutEdTl =3D new GridLayout(2, false); layoutEdTl.verticalSpacing =3D 0; layoutEdTl.marginHeight =3D 0; @@ -570,12 +552,7 @@ } = container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - String splitting =3D VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING - .getValue(); - if (CustomSashForm.LAYOUT_HORIZONTAL_SOURCE_LEFT - .equalsIgnoreCase(splitting) - || CustomSashForm.LAYOUT_VERTICAL_SOURCE_TOP - .equalsIgnoreCase(splitting)) { + if (CustomSashForm.isSourceEditorFirst()) { sourceContent =3D new Composite(container, SWT.NONE); visualContent =3D new Composite(container, SWT.NONE); } else { @@ -598,24 +575,11 @@ } }; int[] weights =3D loadSplitterPosition(); - if (weights !=3D null) + if (weights !=3D null) { container.setWeights(weights); + } container.setSashBorders(new boolean[] { true, true, true }); - = - final PropertyChangeListener weightsChangeListener =3D new PropertyChang= eListener() { - public void propertyChange(PropertyChangeEvent event) { - saveSplitterPosition(container.getWeights()); - } - }; - container.addWeightsChangeListener(weightsChangeListener); - container.addDisposeListener(new DisposeListener() { = - public void widgetDisposed(DisposeEvent e) { - container.removeWeightsChangeListener(weightsChangeListener); - container.removeDisposeListener(this); - } - = - }); controlListener =3D new ControlListener() { public void controlMoved(ControlEvent event) {} public void controlResized(ControlEvent event) { @@ -813,7 +777,7 @@ }; } = - private void fillContainer() { + public void fillContainer() { /* * https://jira.jboss.org/jira/browse/JBIDE-4152 * = @@ -825,11 +789,13 @@ */ CustomSashForm newContainer =3D new CustomSashForm(cmpEd, CustomSashForm .getSplittingFromPreferences()); + newContainer.setOrientation(CustomSashForm.getSplittingFromPreferences()= ); + /* * Reset editor's settings. = */ if (editorSettings !=3D null) { - editorSettings.dispose(); + editorSettings.clearOldSettings(); editorSettings.addSetting(new SashSetting(newContainer)); } newContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -839,12 +805,7 @@ * Correct layout by selecting the order of components adding. * All three editors should be added to the new container. */ - String splitting =3D VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING - .getValue(); - if (CustomSashForm.LAYOUT_HORIZONTAL_SOURCE_LEFT - .equalsIgnoreCase(splitting) - || CustomSashForm.LAYOUT_VERTICAL_SOURCE_TOP - .equalsIgnoreCase(splitting)) { + if (CustomSashForm.isSourceEditorFirst()) { sourceContent.setParent(newContainer); visualContent.setParent(newContainer); } else { @@ -860,7 +821,6 @@ if (null !=3D container.getMaximizedControl()) { newContainer.setMaximizedControl(container.getMaximizedControl()); } - = /* * Dispose the old container: * it'll be excluded from parent composite's layout. @@ -873,28 +833,43 @@ * Reset the container. */ container =3D newContainer; - int[] weights =3D loadSplitterPosition(); - if (weights !=3D null) { - container.setWeights(weights); + = + /* + * Set up new sash weights + */ + int defaultWeight =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS); + int[] weights =3D container.getWeights(); + if (defaultWeight =3D=3D 0) { + if (CustomSashForm.isSourceEditorFirst()) { + container.maxDown(); + } else { + container.maxUp(); + } + } else if (defaultWeight =3D=3D 1000) { + if (CustomSashForm.isSourceEditorFirst()) { + container.maxUp(); + } else { + container.maxDown(); + } + } else { + if (CustomSashForm.isSourceEditorFirst()) { + weights[0] =3D 1000 - defaultWeight; + weights[1] =3D defaultWeight; + } else { + weights[0] =3D defaultWeight; + weights[1] =3D 1000 - defaultWeight; + } + if ((weights !=3D null) && !container.isDisposed()){ + container.setWeights(weights); + } } + = container.setSashBorders(new boolean[] { true, true, true }); = /* * Reinit listeners on the new container. */ - final PropertyChangeListener weightsChangeListener =3D new PropertyChang= eListener() { - public void propertyChange(PropertyChangeEvent event) { - saveSplitterPosition(container.getWeights()); - } - }; - container.addWeightsChangeListener(weightsChangeListener); - container.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { - container.removeWeightsChangeListener(weightsChangeListener); - container.removeDisposeListener(this); - } - - }); controlListener =3D new ControlListener() { public void controlMoved(ControlEvent event) {} public void controlResized(ControlEvent event) { @@ -903,9 +878,9 @@ }; = /* - * Layout parent composite. + * Layout the parent container for CustomSashForm, Selection Bar. */ - cmpEd.layout(true, true); + cmpEdTl.layout(true, true); } = public void createVisualEditor() { @@ -1142,8 +1117,9 @@ } = public VpeController getController() { - if (visualEditor =3D=3D null) + if (visualEditor =3D=3D null) { return null; + } return visualEditor.getController(); } = @@ -1164,4 +1140,25 @@ if (container !=3D null) container.maxUp(); } + = + /* + * Updates current VpeEditorPart after = + * OK/Apply button on "Visual Page Editor" preference page + * has been pressed. + */ + public void updatePartAccordingToPreferences() { + /* + * When switching from Source view to Visual/Source + * controller could be null. + */ + if (getController() !=3D null) { + selectionBar.setVisible(selectionBar.getAlwaysVisibleOption()); + fillContainer(); + getController().getVisualBuilder().setShowInvisibleTags(JspEditorPlugi= n.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_NON_VISUAL_TAGS)); + getController().getPageContext().getBundle().updateShowBundleUsageAsEL= (); + getController().visualRefresh(); + } + } + = } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeVisualDomBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eVisualDomBuilder.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eVisualDomBuilder.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -38,6 +38,8 @@ import org.eclipse.wst.xml.core.internal.document.NodeImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.resref.core.ResourceReference; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.vpe.VpeDebug; @@ -185,8 +187,8 @@ // faceletFile =3D false; // } = - this.showInvisibleTags =3D Constants.YES_STRING - .equals(VpePreference.SHOW_INVISIBLE_TAGS.getValue()); + this.showInvisibleTags =3D JspEditorPlugin.getDefault().getPreferenceSto= re().getBoolean( + IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); = } = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/bundle/BundleMap.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bu= ndle/BundleMap.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bu= ndle/BundleMap.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -47,7 +47,8 @@ import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.vpe.VpePlugin; @@ -64,7 +65,8 @@ private BundleEntry[] bundles =3D new BundleEntry[0]; private Map usedKeys =3D new HashMap(); = - boolean isShowBundleUsageAsEL =3D "yes".equals(VpePreference.SHOW_RESO= URCE_BUNDLES.getValue()); //$NON-NLS-1$ + boolean isShowBundleUsageAsEL =3D JspEditorPlugin.getDefault().getPref= erenceStore().getBoolean( + IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); = XModelTreeListener modelListener =3D new ML(); = public void init(StructuredTextEditor editor){ @@ -461,7 +463,15 @@ } } = - + public void updateShowBundleUsageAsEL() { + boolean b =3D JspEditorPlugin.getDefault().getPreferenceStore().getBoole= an( + IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); + if(isShowBundleUsageAsEL !=3D b) { + isShowBundleUsageAsEL =3D b; + refresh(); + } = + } + = static class Expression { public String prefix; public String propertyName; @@ -503,11 +513,7 @@ class ML implements XModelTreeListener { = public void nodeChanged(XModelTreeEvent event) { - boolean b =3D "yes".equals(VpePreference.SHOW_RESOURCE_BUNDLES.getVa= lue()); //$NON-NLS-1$ - if(isShowBundleUsageAsEL !=3D b) { - isShowBundleUsageAsEL =3D b; - refresh(); - } = + updateShowBundleUsageAsEL(); } = public void structureChanged(XModelTreeEvent event) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/mozilla/MozillaEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -64,8 +64,8 @@ import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.internal.part.StatusPart; import org.eclipse.ui.part.EditorPart; -import org.jboss.tools.common.model.XModelException; -import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage; @@ -78,7 +78,6 @@ import org.jboss.tools.vpe.editor.util.DocTypeUtil; import org.jboss.tools.vpe.editor.util.FileUtil; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.editor.xpl.CustomSashForm; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.resref.core.ReferenceWizard; import org.jboss.tools.vpe.resref.core.VpeResourcesDialog; @@ -133,20 +132,27 @@ private String doctype; = private static Map layoutIcons; - private static List layoutNames; + private static Map layoutNames; + private static List layoutValues; static { layoutIcons =3D new HashMap(); - layoutIcons.put(CustomSashForm.LAYOUT_HORIZONTAL_SOURCE_LEFT, ICON_OR= IENTATION_SOURCE_LEFT); - layoutIcons.put(CustomSashForm.LAYOUT_VERTICAL_SOURCE_TOP, ICON_ORIEN= TATION_SOURCE_TOP); - layoutIcons.put(CustomSashForm.LAYOUT_HORIZONTAL_VISUAL_LEFT, ICON_OR= IENTATION_SOURCE_RIGHT); - layoutIcons.put(CustomSashForm.LAYOUT_VERTICAL_VISUAL_TOP, ICON_ORIEN= TATION_SOURCE_BOTTOM); + layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE= , ICON_ORIENTATION_SOURCE_LEFT); + layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE, = ICON_ORIENTATION_SOURCE_TOP); + layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE= , ICON_ORIENTATION_SOURCE_RIGHT); + layoutIcons.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, = ICON_ORIENTATION_SOURCE_BOTTOM); = - layoutNames =3D new ArrayList(); - layoutNames.add(CustomSashForm.LAYOUT_HORIZONTAL_SOURCE_LEFT); - layoutNames.add(CustomSashForm.LAYOUT_VERTICAL_SOURCE_TOP); - layoutNames.add(CustomSashForm.LAYOUT_HORIZONTAL_VISUAL_LEFT); - layoutNames.add(CustomSashForm.LAYOUT_VERTICAL_VISUAL_TOP); + layoutNames =3D new HashMap(); + layoutNames.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE= , VpeUIMessages.SPLITTING_HORIZ_LEFT_SOURCE); + layoutNames.put(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE, = VpeUIMessages.SPLITTING_VERT_TOP_SOURCE); + layoutNames.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE= , VpeUIMessages.SPLITTING_HORIZ_LEFT_VISUAL); + layoutNames.put(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE, = VpeUIMessages.SPLITTING_VERT_TOP_VISUAL); = + layoutValues=3D new ArrayList(); + layoutValues.add(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALU= E); + layoutValues.add(IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE); + layoutValues.add(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALU= E); + layoutValues.add(IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE); + } = /** @@ -259,46 +265,64 @@ * https://jira.jboss.org/jira/browse/JBIDE-4152 * Compute initial icon state and add it to the tool bar. */ - int currentOrientationIndex =3D layoutNames.indexOf(VpePreference.VISUAL= _SOURCE_EDITORS_SPLITTING.getValue()); + int currentOrientationIndex =3D layoutValues.indexOf(JspEditorPlugin + .getDefault().getPreferenceStore().getString( + IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); int newIndx =3D currentOrientationIndex+1; - if (newIndx =3D=3D layoutNames.size()) { - newIndx =3D newIndx % layoutNames.size(); + if (newIndx =3D=3D layoutValues.size()) { + newIndx =3D newIndx % layoutValues.size(); } - String newOrientation =3D layoutNames.get(newIndx); + String newOrientation =3D layoutValues.get(newIndx); = final ToolItem rotateEditorsItem =3D createToolItem(verBar, SWT.BUTTON1, - layoutIcons.get(newOrientation), - ICON_ORIENTATION_SOURCE_LEFT_DISABLED, newOrientation, true); + layoutIcons.get(newOrientation), + ICON_ORIENTATION_SOURCE_LEFT_DISABLED, = + layoutNames.get(newOrientation), true); + = rotateEditorsItem.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { - try { - /* - * Rotate editors orientation clockwise. - * Store this new orientation to the preferences. - */ - int currentOrientationIndex =3D layoutNames.indexOf(VpePreference.V= ISUAL_SOURCE_EDITORS_SPLITTING.getValue()); - int newIndx =3D currentOrientationIndex+1; - if (newIndx =3D=3D layoutNames.size()) { - newIndx =3D newIndx % layoutNames.size(); - } - String newOrientation =3D layoutNames.get(newIndx); - VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING.setValue(newOrientati= on); + /* + * Rotate editors orientation clockwise. Store this new + * orientation to the preferences. + */ + int currentOrientationIndex =3D layoutValues + .indexOf(JspEditorPlugin + .getDefault() + .getPreferenceStore() + .getString( + IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); + int newIndx =3D currentOrientationIndex + 1; + if (newIndx =3D=3D layoutValues.size()) { + newIndx =3D newIndx % layoutValues.size(); + } + String newOrientation =3D layoutValues.get(newIndx); + JspEditorPlugin.getDefault().getPreferenceStore().setValue( + IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, + newOrientation); = - /* - * Compute next step orientation and display appropriate icon. - */ - currentOrientationIndex =3D layoutNames.indexOf(VpePreference.VISUA= L_SOURCE_EDITORS_SPLITTING.getValue()); - newIndx =3D currentOrientationIndex+1; - if (newIndx =3D=3D layoutNames.size()) { - newIndx =3D newIndx % layoutNames.size(); - } - newOrientation =3D layoutNames.get(newIndx); - rotateEditorsItem.setImage(ImageDescriptor - .createFromFile(MozillaEditor.class, layoutIcons.get(newOrientatio= n)).createImage()); - rotateEditorsItem.setToolTipText(newOrientation); - } catch (XModelException e) { - VpePlugin.getPluginLog().logError(e); - } + /* + * Compute next step orientation and display appropriate icon. + */ + currentOrientationIndex =3D layoutValues + .indexOf(JspEditorPlugin + .getDefault() + .getPreferenceStore() + .getString( + IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); + newIndx =3D currentOrientationIndex + 1; + if (newIndx =3D=3D layoutValues.size()) { + newIndx =3D newIndx % layoutValues.size(); + } + newOrientation =3D layoutValues.get(newIndx); + rotateEditorsItem.setImage(ImageDescriptor.createFromFile( + MozillaEditor.class, layoutIcons.get(newOrientation)) + .createImage()); + rotateEditorsItem.setToolTipText(layoutNames.get(newOrientation)); + /* + * Call filContainer() from VpeEditorPart + * to redraw CustomSashForm with new layout. + */ + getController().getPageContext().getEditPart().fillContainer(); } }); = @@ -356,8 +380,8 @@ // create menu item MenuItem menuItem =3D new MenuItem(dropDownMenu.getDropDownMenu(), SWT.= PUSH); // get default value of flag - boolean showInvisibleTags =3D Constants.YES_STRING - .equals(VpePreference.SHOW_INVISIBLE_TAGS.getValue()); + boolean showInvisibleTags =3D JspEditorPlugin.getDefault().getPreferenc= eStore().getBoolean( + IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); = // set text menuItem.setText(showInvisibleTags ? VpeUIMessages.HIDE_NON_VISUAL_TAGS Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /preferences/SliderFieldEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/SliderFieldEditor.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/SliderFieldEditor.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -0,0 +1,186 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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.vpe.editor.preferences; + +import org.eclipse.jface.preference.FieldEditor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Slider; + +public class SliderFieldEditor extends FieldEditor { + + private static final String SLIDER_LABEL_DEFAULT_TEXT =3D "50% "; //$NON-= NLS-1$ + private static final String SLIDER_LABEL_MAX_SIZE_TEXT =3D "100% "; //$NO= N-NLS-1$ + private static final int MAX_SLIDER_VALUE =3D 1000; + private static final int MIN_SLIDER_VALUE =3D 0; + private static final int INCREMENT_SLIDER_VALUE =3D 10; + private static final int DEFAULT_SLIDER_VALUE =3D 500; + = + private Composite sliderComposite; + private Label sliderLabel; + private Slider slider; + private int value; + = + public SliderFieldEditor(String name, String labelText, Composite parent)= { + super(name, labelText, parent); + } + + @Override + protected void adjustForNumColumns(int numColumns) { + if (numColumns > 1) { + Control control =3D getLabelControl(); + int left =3D numColumns; + if (control !=3D null) { + ((GridData)control.getLayoutData()).horizontalSpan =3D 1; + left =3D left - 1; + } + if (sliderComposite !=3D null) { + ((GridData)sliderComposite.getLayoutData()).horizontalSpan =3D left; + } + } else { + Control control =3D getLabelControl(); + if (control !=3D null) { + ((GridData)control.getLayoutData()).horizontalSpan =3D 1; + } + if (sliderComposite !=3D null) { + ((GridData)sliderComposite.getLayoutData()).horizontalSpan =3D 1; + } + } + } + + @Override + protected void createControl(Composite parent) { + doFillIntoGrid(parent, 2); + } + = + @Override + protected void doFillIntoGrid(Composite parent, int numColumns) { + int sliderSpan =3D 1; + if (numColumns > 1) { + sliderSpan =3D numColumns - 1; + } + Control control =3D getLabelControl(parent); + GridData gd =3D new GridData(); + gd.horizontalSpan =3D 1; + control.setLayoutData(gd); + control =3D getSliderComposite(parent); + gd =3D new GridData(); + gd.horizontalSpan =3D sliderSpan; + gd.horizontalAlignment =3D GridData.FILL; + control.setLayoutData(gd); + control.setFont(parent.getFont()); + } + + @Override + protected void doLoad() { + updateSliderForValue(getPreferenceStore().getInt(getPreferenceName())); + } + + @Override + protected void doLoadDefault() { + updateSliderForValue(getPreferenceStore().getDefaultInt(getPreferenceNam= e())); + } + + @Override + protected void doStore() { + if (value < 0) { + getPreferenceStore().setToDefault(getPreferenceName()); + return; + } + getPreferenceStore().setValue(getPreferenceName(), value); + } + + @Override + public int getNumberOfControls() { + return 2; + } + = + private Composite getSliderComposite(Composite parent) { + if (sliderComposite =3D=3D null) { + /* + * Create composite control with label and slider in it. = + */ + sliderComposite =3D new Composite(parent, SWT.NONE); + GridLayout gridLayout =3D new GridLayout(); + gridLayout.numColumns =3D 2; + gridLayout.marginWidth =3D 0; + gridLayout.marginHeight =3D 0; + gridLayout.horizontalSpacing =3D HORIZONTAL_GAP; + sliderComposite.setLayout(gridLayout); + GridData gd =3D new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); + sliderComposite.setLayoutData(gd); + = + /* + * Create slider label + */ + sliderLabel =3D new Label(sliderComposite,SWT.NONE); + gd =3D new GridData(SWT.LEFT, SWT.NONE, false, false, 1, 1); + sliderLabel.setLayoutData(gd); + /* + * Compute label size + */ + sliderLabel.setText(SLIDER_LABEL_MAX_SIZE_TEXT); + Point size =3D sliderLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); + sliderLabel.setSize(size); + sliderLabel.setText(SLIDER_LABEL_DEFAULT_TEXT); + + /* + * Create slider + */ + slider =3D new Slider(sliderComposite, SWT.HORIZONTAL); + gd =3D new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); + slider.setLayoutData(gd); + slider.setMaximum(MAX_SLIDER_VALUE + slider.getThumb()); + slider.setMinimum(MIN_SLIDER_VALUE); + slider.setIncrement(INCREMENT_SLIDER_VALUE); + slider.setSelection(DEFAULT_SLIDER_VALUE); + = + slider.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + updateSlider(); + } + }); + } + = + return sliderComposite; + } + = + private void updateSlider() { + int oldValue =3D value; + value =3D slider.getSelection(); + if (oldValue !=3D value) { + setPresentsDefaultValue(false); + String weightsString =3D "" + (value /10) + "%"; //$NON-NLS-1$ //$NON-= NLS-2$ + slider.setToolTipText(weightsString); + sliderLabel.setText(weightsString); + fireValueChanged(VALUE, oldValue, value); + } + } + = + private void updateSliderForValue(int value) { + if (slider !=3D null) { + String weightsString =3D "" + (value /10) + "%"; //$NON-NLS-1$ //$NON-= NLS-2$ + this.value =3D value; + slider.setSelection(value); + slider.setToolTipText(weightsString); + sliderLabel.setText(weightsString); + } + } + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/to= ols/vpe/editor/preferences/SliderFieldEditor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /preferences/VpeComboFieldEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/VpeComboFieldEditor.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/VpeComboFieldEditor.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -0,0 +1,204 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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.vpe.editor.preferences; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.preference.FieldEditor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + +public class VpeComboFieldEditor extends FieldEditor { + + /** + * The Combo widget. + */ + private Combo fCombo; + = + /** + * The value (not the name) of the currently selected item in the Combo w= idget. + */ + private String fValue; + = + /** + * The names (labels) and underlying values to populate the combo widget.= These should be + * arranged as: { {name1, value1}, {name2, value2}, ...} + */ + private String[][] fEntryNamesAndValues; + = + /** + * Create the combo box field editor. + * = + * @param name the name of the preference this field editor works on + * @param labelText the label text of the field editor + * @param entryNamesAndValues the names (labels) and underlying values to= populate the combo widget. These should be + * arranged as: { {name1, value1}, {name2, value2}, ...} + * @param parent the parent composite + */ + public VpeComboFieldEditor(String name, String labelText, + String[][] entryNamesAndValues, Composite parent) { + init(name, labelText); + Assert.isTrue(checkArray(entryNamesAndValues)); + fEntryNamesAndValues =3D entryNamesAndValues; + createControl(parent); + } + + /** + * Checks whether given String[][] is of "type" = + * String[][2]. + * + * @return true if it is ok, and false otherwise + */ + private boolean checkArray(String[][] table) { + if (table =3D=3D null) { + return false; + } + for (int i =3D 0; i < table.length; i++) { + String[] array =3D table[i]; + if (array =3D=3D null || array.length !=3D 2) { + return false; + } + } + return true; + } + = + /* (non-Javadoc) + * @see org.eclipse.jface.preference.FieldEditor#adjustForNumColumns(int) + */ + protected void adjustForNumColumns(int numColumns) { + if (numColumns > 1) { + Control control =3D getLabelControl(); + int left =3D numColumns; + if (control !=3D null) { + ((GridData)control.getLayoutData()).horizontalSpan =3D 1; + left =3D left - 1; + } + ((GridData)fCombo.getLayoutData()).horizontalSpan =3D left; + } else { + Control control =3D getLabelControl(); + if (control !=3D null) { + ((GridData)control.getLayoutData()).horizontalSpan =3D 1; + } + ((GridData)fCombo.getLayoutData()).horizontalSpan =3D 1; = + } + } + = + @Override + protected void createControl(Composite parent) { + doFillIntoGrid(parent, 1); + } + = + @Override + protected void doFillIntoGrid(Composite parent, int numColumns) { + /* + * Label + */ + Control control =3D getLabelControl(parent); + GridData gd =3D new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); + control.setLayoutData(gd); + = + /* + * Combo + */ + control =3D getComboBoxControl(parent); + gd =3D new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); + control.setLayoutData(gd); + control.setFont(parent.getFont()); + } + = + /* (non-Javadoc) + * @see org.eclipse.jface.preference.FieldEditor#doLoad() + */ + protected void doLoad() { + updateComboForValue(getPreferenceStore().getString(getPreferenceName())); + } + + /* (non-Javadoc) + * @see org.eclipse.jface.preference.FieldEditor#doLoadDefault() + */ + protected void doLoadDefault() { + updateComboForValue(getPreferenceStore().getDefaultString(getPreferenceN= ame())); + } + = + /* (non-Javadoc) + * @see org.eclipse.jface.preference.FieldEditor#doStore() + */ + protected void doStore() { + if (fValue =3D=3D null) { + getPreferenceStore().setToDefault(getPreferenceName()); + return; + } + getPreferenceStore().setValue(getPreferenceName(), fValue); + } + = + /* + * Lazily create and return the Combo control. + */ + protected Combo getComboBoxControl(Composite parent) { + if (fCombo =3D=3D null) { + fCombo =3D new Combo(parent, SWT.READ_ONLY); + fCombo.setFont(parent.getFont()); + for (int i =3D 0; i < fEntryNamesAndValues.length; i++) { + fCombo.add(fEntryNamesAndValues[i][0], i); + } + = + fCombo.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent evt) { + String oldValue =3D fValue; + String name =3D fCombo.getText(); + fValue =3D getValueForName(name); + setPresentsDefaultValue(false); + fireValueChanged(VALUE, oldValue, fValue); = + } + }); + } + return fCombo; + } + = + /* + * Given the name (label) of an entry, return the corresponding value. + */ + protected String getValueForName(String name) { + for (int i =3D 0; i < fEntryNamesAndValues.length; i++) { + String[] entry =3D fEntryNamesAndValues[i]; + if (name.equals(entry[0])) { + return entry[1]; + } + } + return fEntryNamesAndValues[0][0]; + } + = + /* + * Set the name in the combo widget to match the specified value. + */ + protected void updateComboForValue(String value) { + fValue =3D value; + for (int i =3D 0; i < fEntryNamesAndValues.length; i++) { + if (value.equals(fEntryNamesAndValues[i][1])) { + fCombo.setText(fEntryNamesAndValues[i][0]); + return; + } + } + if (fEntryNamesAndValues.length > 0) { + fValue =3D fEntryNamesAndValues[0][1]; + fCombo.setText(fEntryNamesAndValues[0][0]); + } + } + + @Override + public int getNumberOfControls() { + return 2; + } +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/to= ols/vpe/editor/preferences/VpeComboFieldEditor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/preferences/VpeEditorPreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/VpeEditorPreferencesPage.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/VpeEditorPreferencesPage.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -10,24 +10,18 @@ *************************************************************************= *****/ = package org.jboss.tools.vpe.editor.preferences; = -import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PreferencesUtil; import org.jboss.tools.common.model.ui.preferences.TabbedPreferencesPage; -import org.jboss.tools.common.model.ui.preferences.XMOBasedPreferencesPage; -import org.jboss.tools.common.model.ui.util.ModelUtilities; -import org.jboss.tools.jst.jsp.preferences.VpePreference; -import org.jboss.tools.vpe.VpePlugin; -import org.jboss.tools.vpe.messages.VpeUIMessages; = public class VpeEditorPreferencesPage extends TabbedPreferencesPage implem= ents IWorkbenchPreferencePage { = = public static final String ID =3D "org.jboss.tools.vpe.editor"; //$NON-N= LS-1$ public VpeEditorPreferencesPage() { - addPreferencePage(new GeneralPage()); + addPreferencePage(new VpePreferencesPage()); addPreferencePage(new TemplatesPreferencePage()); } = @@ -41,13 +35,4 @@ prefsdlg.open(); } = - static class GeneralPage extends XMOBasedPreferencesPage { - public GeneralPage() { - super(ModelUtilities.getPreferenceModel().getByPath(VpePreference.VPE_E= DITOR_PATH)); - } - - public String getTitle() { - return VpeUIMessages.GENERAL; - } - } } \ No newline at end of file Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /preferences/VpePreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/VpePreferencesPage.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/pr= eferences/VpePreferencesPage.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -0,0 +1,184 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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.vpe.editor.preferences; + +import org.eclipse.jface.preference.BooleanFieldEditor; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorReference; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.editor.IVisualEditor; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; +import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.vpe.editor.VpeEditorPart; +import org.jboss.tools.vpe.messages.VpeUIMessages; + +public class VpePreferencesPage extends FieldEditorPreferencePage implemen= ts + IWorkbenchPreferencePage, IVpePreferencesPage { + + private static final String[][] DEFAULT_VPE_TAB_COMBO_BOX_VALUES =3D { + { VpeUIMessages.DEFAULT_VPE_TAB_VISUAL_SOURCE, + DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE }, + { VpeUIMessages.DEFAULT_VPE_TAB_SOURCE, + DEFAULT_VPE_TAB_SOURCE_VALUE }, + { VpeUIMessages.DEFAULT_VPE_TAB_PREVIEW, + DEFAULT_VPE_TAB_PREVIEW_VALUE } }; + private static final String[][] SPLITTING_COMBO_BOX_VALUES =3D { + { VpeUIMessages.SPLITTING_VERT_TOP_SOURCE, + SPLITTING_VERT_TOP_SOURCE_VALUE }, + { VpeUIMessages.SPLITTING_VERT_TOP_VISUAL, + SPLITTING_VERT_TOP_VISUAL_VALUE }, + { VpeUIMessages.SPLITTING_HORIZ_LEFT_SOURCE, + SPLITTING_HORIZ_LEFT_SOURCE_VALUE }, + { VpeUIMessages.SPLITTING_HORIZ_LEFT_VISUAL, + SPLITTING_HORIZ_LEFT_VISUAL_VALUE } }; + = + private Composite pageContainer; + private Group visualAppearanceGroup; + private Group confirmationGroup; + private Group tabsGroup; + = + public VpePreferencesPage() { + super(); + setPreferenceStore(getPreferenceStore()); + } + + public void init(IWorkbench workbench) { + /* + * Do nothing + */ + } + + public String getTitle() { + return VpeUIMessages.GENERAL_TAB_TITLE; + } + = + @Override + protected Control createContents(Composite parent) { + = + pageContainer =3D new Composite(parent, SWT.NONE); + GridLayout layout =3D new GridLayout(); + layout.numColumns =3D 1; + layout.marginHeight =3D 10; + layout.marginWidth =3D 10; + layout.horizontalSpacing =3D 10; + layout.verticalSpacing =3D 10; + GridData gd =3D new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); + pageContainer.setLayout(layout); + pageContainer.setLayoutData(gd); + = + visualAppearanceGroup =3D new Group(pageContainer, SWT.SHADOW_ETCH= ED_IN); + visualAppearanceGroup.setText(VpeUIMessages.VISUAL_APPEARANCE_GROU= P_TITLE); + layout =3D new GridLayout(); + layout.marginHeight =3D 10; + layout.marginWidth =3D 10; + layout.horizontalSpacing =3D 10; + layout.verticalSpacing =3D 10; + visualAppearanceGroup.setLayout(layout); + gd =3D new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); + visualAppearanceGroup.setLayoutData(gd); + = + confirmationGroup =3D new Group(pageContainer, SWT.SHADOW_ETCHED_IN); + confirmationGroup.setText(VpeUIMessages.CONFIRMATION_GROUP_TITLE); + layout =3D new GridLayout(); + layout.marginHeight =3D 10; + layout.marginWidth =3D 10; + layout.horizontalSpacing =3D 10; + layout.verticalSpacing =3D 10; + confirmationGroup.setLayout(layout); + gd =3D new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); + confirmationGroup.setLayoutData(gd); + = + tabsGroup =3D new Group(pageContainer, SWT.SHADOW_ETCHED_IN); + tabsGroup.setText(VpeUIMessages.TABS_GROUP_TITLE); + layout =3D new GridLayout(); + layout.marginHeight =3D 10; + layout.marginWidth =3D 10; + tabsGroup.setLayout(layout); + gd =3D new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); + tabsGroup.setLayoutData(gd); + = + createFieldEditors(); + initialize(); + checkState(); + = + return pageContainer; + } + = + @Override + protected Composite getFieldEditorParent() { + return pageContainer; + } + + @Override + protected void createFieldEditors() { + addField(new BooleanFieldEditor(SHOW_BORDER_FOR_UNKNOWN_TAGS, + VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS, visualAppearanceGroup)); + addField(new BooleanFieldEditor(SHOW_NON_VISUAL_TAGS, + VpeUIMessages.SHOW_NON_VISUAL_TAGS, visualAppearanceGroup)); + addField(new BooleanFieldEditor(SHOW_SELECTION_TAG_BAR, + VpeUIMessages.SHOW_SELECTION_TAG_BAR, visualAppearanceGroup)); + addField(new BooleanFieldEditor(SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, + VpeUIMessages.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, visualAppearanceGroup= )); + addField(new BooleanFieldEditor(ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, + VpeUIMessages.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, confirmationGroup)); + addField(new BooleanFieldEditor(ASK_CONFIRMATION_ON_CLOSING_SELECTION_BA= R, + VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, confirmationG= roup)); + addField(new VpeComboFieldEditor(DEFAULT_VPE_TAB, + VpeUIMessages.DEFAULT_VPE_TAB, DEFAULT_VPE_TAB_COMBO_BOX_VALUES, tabsG= roup)); + addField(new VpeComboFieldEditor(VISUAL_SOURCE_EDITORS_SPLITTING, + VpeUIMessages.VISUAL_SOURCE_EDITORS_SPLITTING, SPLITTING_COMBO_BOX_VAL= UES, tabsGroup)); + addField(new SliderFieldEditor(VISUAL_SOURCE_EDITORS_WEIGHTS, + VpeUIMessages.VISUAL_SOURCE_EDITORS_WEIGHTS, tabsGroup)); + } + + @Override + public boolean performOk() { + super.performOk(); + IEditorReference[] editors =3D VpePlugin.getDefault().getWorkbench().get= ActiveWorkbenchWindow().getActivePage().getEditorReferences(); + for (IEditorReference editor : editors) { + IEditorPart editorPart =3D editor.getEditor(false); + if ((editorPart !=3D null) && (editorPart instanceof JSPMultiPageEditor= )) { + JSPMultiPageEditor mpe =3D (JSPMultiPageEditor)editorPart; + IVisualEditor visualEditor =3D (mpe).getVisualEditor(); + if (visualEditor instanceof VpeEditorPart) { + VpeEditorPart vep =3D (VpeEditorPart) visualEditor; + /* + * Update visual editor + */ + vep.updatePartAccordingToPreferences(); + /* + * Change selected tab + */ + mpe.updatePartAccordingToPreferences(); + } + } + } + = + return true; + } + + @Override + public IPreferenceStore getPreferenceStore() { + return JspEditorPlugin.getDefault().getPreferenceStore(); + } + = +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/to= ols/vpe/editor/preferences/VpePreferencesPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/template/VpeAnyCreator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te= mplate/VpeAnyCreator.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te= mplate/VpeAnyCreator.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -15,7 +15,8 @@ import java.util.Map; import java.util.Set; = -import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.expression.VpeExpression; @@ -180,7 +181,8 @@ = String styleString =3D getExprValue(pageContext, styleExpr, sourceNode); = - if ("yes".equalsIgnoreCase(VpePreference.SHOW_BORDER_FOR_UNKNOWN_TAGS.ge= tValue())) { //$NON-NLS-1$ + if (JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS)) { styleString =3D "border: 1px solid green;" +styleString; //$NON-NLS-1$ } = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/xpl/CustomSashForm.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -29,7 +29,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Sash; -import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.vpe.messages.VpeUIMessages; = /** @@ -45,10 +46,6 @@ public class CustomSashForm extends SashForm { = public static final String copyright =3D "(c) Copyright IBM Corporation 2= 002."; //$NON-NLS-1$ - public static final String LAYOUT_VERTICAL_SOURCE_TOP =3D "Vertical Sourc= e on top"; //$NON-NLS-1$ - public static final String LAYOUT_VERTICAL_VISUAL_TOP =3D "Vertical Visua= l on top"; //$NON-NLS-1$ - public static final String LAYOUT_HORIZONTAL_SOURCE_LEFT =3D "Horizontal = Source to the left"; //$NON-NLS-1$ - public static final String LAYOUT_HORIZONTAL_VISUAL_LEFT =3D "Horizontal = Visual to the left"; //$NON-NLS-1$ /** * Custom style bits. They set whether max to one side of the other * is not permitted. For example, if NO_MAX_UP, then there will be only @@ -81,17 +78,11 @@ /* * Init the sash weight with the default value. = */ - String defaultWeightString =3D VpePreference.SOURCE_VISUAL_EDITORS_W= EIGHTS.getValue(); - try { - int defaultWeight =3D Integer.parseInt(defaultWeightString); + int defaultWeight =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS); if (defaultWeight > 0) { weight =3D defaultWeight; } - } catch (NumberFormatException e) { - /* - * Do nothing - */ - } } }; = @@ -382,7 +373,8 @@ if (currentSashInfo.cursorOver !=3D i) { currentSashInfo.cursorOver =3D i; currentSashInfo.sash.redraw(); - String splitting =3D VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING= .getValue(); + String splitting =3D JspEditorPlugin.getDefault().getPreferenceSto= re() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); switch (locs[ARROW_TYPE_INDEX]) { case UP_ARROW: case DOWN_ARROW: @@ -393,20 +385,20 @@ * https://jira.jboss.org/jira/browse/JBIDE-4270 * Tooltip text should correspond panes position. */ - if (LAYOUT_HORIZONTAL_SOURCE_LEFT.equalsIgnoreCase(splitting) - || LAYOUT_VERTICAL_SOURCE_TOP.equalsIgnoreCase(splitting)) { - currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE= ); - } else { - currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE= ); - } + if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE.equalsI= gnoreCase(splitting) + || IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE.equalsIg= noreCase(splitting)) { + currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PAN= E); + } else { + currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PAN= E); + } break; case DOWN_MAX_ARROW: - if (LAYOUT_HORIZONTAL_SOURCE_LEFT.equalsIgnoreCase(splitting) - || LAYOUT_VERTICAL_SOURCE_TOP.equalsIgnoreCase(splitting)) { - currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE= ); - } else { - currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE= ); - } + if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE.equalsI= gnoreCase(splitting) + || IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE.equalsIg= noreCase(splitting)) { + currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PAN= E); + } else { + currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PAN= E); + } break; } } @@ -1098,16 +1090,7 @@ gc.drawLine(x+3, y+1, x+3, y+6); gc.drawLine(x+2, y+1, x+2, y+7); } - = - public int getSavedWeight() { - if (currentSashInfo!=3Dnull) - return currentSashInfo.weight; - else - return -1; - } - - = protected Sash getSash() { Control[] kids =3D getChildren(); for (int i =3D 0; i < kids.length; i++) { @@ -1117,13 +1100,6 @@ return null; } = - public void setCurrentSavedWeight(int weight) { - if (weight>=3D0 && currentSashInfo!=3Dnull) { - recomputeSashInfo(false); - currentSashInfo.weight=3Dweight; - } - } - = /** * Adds a custom sashform listener. This listener will be removed when = * this control is disposed. @@ -1178,20 +1154,36 @@ } = public void changeOrientation() { - int prefsOrientation =3D getSplittingFromPreferences(); - if (getOrientation() !=3D prefsOrientation) { - setOrientation(prefsOrientation); - } = + int prefsOrientation =3D getSplittingFromPreferences(); + if (getOrientation() !=3D prefsOrientation) { + setOrientation(prefsOrientation); + } } = public static int getSplittingFromPreferences() { - String splitting =3D VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING.ge= tValue(); - if (LAYOUT_HORIZONTAL_SOURCE_LEFT.equalsIgnoreCase(splitting) - || LAYOUT_HORIZONTAL_VISUAL_LEFT.equalsIgnoreCase(splitting)) { - return SWT.HORIZONTAL; - } else { - return SWT.VERTICAL; - } + String splitting =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE + .equalsIgnoreCase(splitting) + || IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE + .equalsIgnoreCase(splitting)) { + return SWT.HORIZONTAL; + } else { + return SWT.VERTICAL; + } } = + public static boolean isSourceEditorFirst() { + boolean sourceEditorFirst =3D false; + String splitting =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE + .equalsIgnoreCase(splitting) + || IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE + .equalsIgnoreCase(splitting)) { + sourceEditorFirst =3D true; + } + return sourceEditorFirst; + } + = } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/xpl/EditorSettings.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/EditorSettings.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/EditorSettings.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -67,6 +67,10 @@ editor=3Dnull; } = + public void clearOldSettings() { + settings.clear(); + } + = public void setInput(FileEditorInput input) { file =3D input.getFile(); for (int i =3D 0; i < settings.size(); i++) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/xpl/SashSetting.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/SashSetting.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/SashSetting.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -9,8 +9,8 @@ import org.eclipse.swt.events.ControlListener; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IEditorPart; -import org.jboss.tools.jst.jsp.preferences.VpePreference; -import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; = = = @@ -30,128 +30,47 @@ private QualifiedName name; private CustomSashForm sash; = - private ControlListener listener=3Dnull; private Control listenedControl=3Dnull; = private int weights[]; = - /** - * Save both the current weights, and the (potential) save - * weights. The first value is the size of the = - * current weights - * = - * @since 1.1.0 - */ - protected void updateWeights() { - weights =3D sash.getWeights(); - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < weights.length; i++) { - if (i>0) - sb.append(EditorSettings.SEPERATOR); - sb.append(weights[i]); - } - sb.append(EditorSettings.SEPERATOR); - sb.append(-1); // seperate between current weights, and saved weights - sb.append(EditorSettings.SEPERATOR); - sb.append(sash.getSavedWeight()); - try { - //fix for JBIDE-3805 - if(resource.exists()) { - resource.setPersistentProperty(name,sb.toString()); - } - } catch (CoreException e) { - VpePlugin.getPluginLog().logError(e); - } - } - = public SashSetting(CustomSashForm s) { sash =3D s; = } = - protected void addListener() { - if (listener=3D=3Dnull && !sash.isDisposed()) { - listener =3D new ControlListener() { = - public void controlResized(ControlEvent e) { - updateWeights(); - } = - public void controlMoved(ControlEvent e) { - updateWeights(); = - } = - }; - listenedControl =3D sash.getChildren()[0]; - listenedControl.addControlListener(listener); = - } = - } - = - protected void removeListener() { - if (listenedControl!=3Dnull && !listenedControl.isDisposed()) { - listenedControl.removeControlListener(listener); - listener=3Dnull; - listenedControl=3Dnull; - } - } - = public void apply() { - try { - String val =3D resource.getPersistentProperty(name); - if (val!=3Dnull) { - StringTokenizer st =3D new StringTokenizer(val,EditorSettings.SEPERATO= R); - weights =3D new int[st.countTokens()]; - int index =3D 0; = - while(st.hasMoreTokens()) { - String s =3D st.nextToken(); - weights[index++]=3DInteger.parseInt(s); + /* + * Set weights from the preference page + */ + int defaultWeight =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS); + int[] weights =3D sash.getWeights(); + if (weights.length > 2) { + if (defaultWeight =3D=3D 0) { + if (CustomSashForm.isSourceEditorFirst()) { + sash.maxDown(); + } else { + sash.maxUp(); } - for (index =3D 0; index < weights.length; index++) { - if (weights[index]<0) - break; = + } else if (defaultWeight =3D=3D 1000) { + if (CustomSashForm.isSourceEditorFirst()) { + sash.maxUp(); + } else { + sash.maxDown(); } - int saved =3D -1; - if (index=3D0) - sash.setCurrentSavedWeight(saved); } else { - /* - * Set weights from the preference page - */ - String stringValue =3D VpePreference.SOURCE_VISUAL_EDITORS_WEIGHTS.get= Value(); - try { - int intValue =3D Integer.parseInt(stringValue); - int[] weights =3D sash.getWeights(); - if (weights.length > 2) { - if (intValue =3D=3D 0) { - sash.maxDown(); - } else if (intValue =3D=3D 1000) { - sash.maxUp(); - } else { - weights[0] =3D intValue; - weights[1] =3D 1000 - intValue; - sash.setWeights(weights); - } - } - } catch (NumberFormatException e) { - // Do nothing + if (CustomSashForm.isSourceEditorFirst()) { + weights[0] =3D 1000 - defaultWeight; + weights[1] =3D defaultWeight; + } else { + weights[0] =3D defaultWeight; + weights[1] =3D 1000 - defaultWeight; } + sash.setWeights(weights); } - } catch (CoreException e1) { - VpePlugin.getPluginLog().logError(e1); } - addListener(); } = - - public void dispose() { = - removeListener(); - } - public void setQualifier(String q) { name =3D new QualifiedName(q,id); = } @@ -163,4 +82,8 @@ public void setResource(IResource r) { resource =3D r; = } + + public void dispose() { + = + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/VpeUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -113,4 +113,25 @@ public static String INCLUDED_CSS_FILES_ABOUT; public static String INCLUDED_TAG_LIBS_ABOUT; public static String SUBSTITUTED_EL_EXPRESSIONS_ABOUT; + = + public static String GENERAL_TAB_TITLE; + public static String VPE_PREFERENCES_PAGE_DESCRIPTION; + public static String SHOW_BORDER_FOR_UNKNOWN_TAGS; + public static String SHOW_SELECTION_TAG_BAR; + public static String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL; + public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT; + public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR; + public static String DEFAULT_VPE_TAB; + public static String VISUAL_SOURCE_EDITORS_SPLITTING; + public static String VISUAL_SOURCE_EDITORS_WEIGHTS; + public static String DEFAULT_VPE_TAB_VISUAL_SOURCE; + public static String DEFAULT_VPE_TAB_SOURCE; + public static String DEFAULT_VPE_TAB_PREVIEW; + public static String SPLITTING_VERT_TOP_SOURCE; + public static String SPLITTING_VERT_TOP_VISUAL; + public static String SPLITTING_HORIZ_LEFT_SOURCE; + public static String SPLITTING_HORIZ_LEFT_VISUAL; + public static String VISUAL_APPEARANCE_GROUP_TITLE; + public static String CONFIRMATION_GROUP_TITLE; + public static String TABS_GROUP_TITLE; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2009-09-14 16:17:42 UTC (rev 17548) @@ -6,8 +6,8 @@ PREFERENCES=3DPreferences REFRESH=3DRefresh PAGE_DESIGN_OPTIONS=3DPage Design Options -HIDE_SELECTION_BAR=3DHide Selection Bar -SHOW_SELECTION_BAR=3DShow Selection Bar +HIDE_SELECTION_BAR=3DHide selection bar +SHOW_SELECTION_BAR=3DShow selection bar MOZILLA_LOADING_ERROR=3DCould not open the Visual Page Editor: {0} MOZILLA_LOADING_ERROR_LINK_TEXT=3DSee JBoss Tools Visual Editor FAQ # START NON-TRANSLATABLE @@ -91,4 +91,28 @@ ACTUAL_RUN_TIME_FOLDERS_ABOUT=3DThese options will be used by Visual Page = Editor for replacing absolute and relative path values when generating a pr= eview INCLUDED_CSS_FILES_ABOUT=3DThese CSS files will be linked by Visual Page E= ditor when generating a preview INCLUDED_TAG_LIBS_ABOUT=3DThese Taglibs will be used by Visual Page Editor= for getting appropriate template for generating a preview, if this Taglibs= doesn't included on page -SUBSTITUTED_EL_EXPRESSIONS_ABOUT=3DThese EL expressions will be substitute= d by Visual Page Editor when generating a preview \ No newline at end of file +SUBSTITUTED_EL_EXPRESSIONS_ABOUT=3DThese EL expressions will be substitute= d by Visual Page Editor when generating a preview + +# Visual Page Editor Preference Page +GENERAL_TAB_TITLE=3DGeneral +VPE_PREFERENCES_PAGE_DESCRIPTION=3DVisual Page Editor settings +SHOW_BORDER_FOR_UNKNOWN_TAGS=3DShow border for unknown tags +SHOW_SELECTION_TAG_BAR=3DShow selection tag bar +SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=3DShow resource bundles usage as EL expr= essions +ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=3DAsk for tag attributes during tag insert +ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=3DAsk for confirmation when clos= ing Selection Bar +DEFAULT_VPE_TAB=3DSelect the default active editor's tab for files that ha= ven't been previously opened in the VPE +VISUAL_SOURCE_EDITORS_SPLITTING=3DVisual/Source editors splitting +VISUAL_SOURCE_EDITORS_WEIGHTS=3DSize of the Visual Editor pane (0-100%) +VISUAL_APPEARANCE_GROUP_TITLE=3DVisual appearance +CONFIRMATION_GROUP_TITLE=3DConfirmation and details +TABS_GROUP_TITLE=3DTabs + +# Visual Page Editor Preference Page List Items +DEFAULT_VPE_TAB_VISUAL_SOURCE=3DVisual/Source +DEFAULT_VPE_TAB_SOURCE=3DSource +DEFAULT_VPE_TAB_PREVIEW=3DPreview +SPLITTING_VERT_TOP_SOURCE=3DVertical splitting with Source Editor on the t= op +SPLITTING_VERT_TOP_VISUAL=3DVertical splitting with Visual Editor on the t= op +SPLITTING_HORIZ_LEFT_SOURCE=3DHorizontal splitting with Source Editor to t= he left +SPLITTING_HORIZ_LEFT_VISUAL=3DHorizontal splitting with Visual Editor to t= he left \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/sel= bar/SelectionBar.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/Se= lectionBar.java 2009-09-14 15:06:24 UTC (rev 17547) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/Se= lectionBar.java 2009-09-14 16:17:42 UTC (rev 17548) @@ -50,6 +50,8 @@ import org.jboss.tools.common.model.ui.attribute.adapter.AdapterFactory; import org.jboss.tools.common.model.ui.attribute.adapter.IModelPropertyEdi= torAdapter; import org.jboss.tools.common.model.ui.util.ModelUtilities; +import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; @@ -126,7 +128,7 @@ = final Listener closeListener =3D new Listener() { public void handleEvent(Event event) { - if (!getHideWithoutPromptOption()) { + if (askConfirmationOnClosingSelectionBar()) { MessageDialogWithToggle dialog =3D MessageDialogWithToggle .openOkCancelConfirm( PlatformUI.getWorkbench() @@ -134,14 +136,13 @@ .getShell(), VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TITLE, VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_MESSAGE, - VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE, - false, null, null); +// VpeUIMessages.CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE, + VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, + askConfirmationOnClosingSelectionBar(), null, null); if (dialog.getReturnCode() !=3D IDialogConstants.OK_ID) { return; } - if (dialog.getToggleState()) { - setHideWithoutPromptOption(true); - } + setAskConfirmationOnClosingSelectionBar(dialog.getToggleState()); } = setAlwaysVisibleOption(false); @@ -203,24 +204,19 @@ } = public boolean getAlwaysVisibleOption() { - return VpePreference.SHOW_SELECTION_TAG_BAR.getValue().equals(PREFERENCE= _YES); + return JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.SHOW_SELECTION_TAG_BAR); } = - public void setHideWithoutPromptOption(boolean hideWithoutPrompt) { - final String optionValue; - if (hideWithoutPrompt) { - optionValue =3D PREFERENCE_YES; - } else { - optionValue =3D PREFERENCE_NO; - } - - setPersistentOption(VpePreference.ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_= PROMT, - optionValue); + public void setAskConfirmationOnClosingSelectionBar(boolean askConfirmati= on) { + JspEditorPlugin.getDefault().getPreferenceStore().setValue( + IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, + askConfirmation); } = - public boolean getHideWithoutPromptOption() { - return VpePreference.ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT - .getValue().equals(PREFERENCE_YES); + public boolean askConfirmationOnClosingSelectionBar() { + return JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( + IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR); } = /** --===============4336600847026990973==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 12:18:22 2009 Content-Type: multipart/mixed; boundary="===============7626745031587518802==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17549 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute: editor and 1 other directory. Date: Mon, 14 Sep 2009 12:18:22 -0400 Message-ID: <200909141618.n8EGIMgx013594@svn01.web.mwc.hst.phx2.redhat.com> --===============7626745031587518802== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-14 12:18:22 -0400 (Mon, 14 Sep 2009) New Revision: 17549 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/attribute/adapter/CheckListAdapter.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/attribute/editor/CheckListFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/attribute/editor/ComboBoxFieldEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-2607 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/attribute/adapter/CheckListAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/adapter/CheckListAdapter.java 2009-09-14 16:17:= 42 UTC (rev 17548) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/adapter/CheckListAdapter.java 2009-09-14 16:18:= 22 UTC (rev 17549) @@ -54,8 +54,9 @@ = public void checkAll() { StringBuffer sb =3D new StringBuffer(); + char separator =3D getSeparator(); for (int i =3D 0; i < tags.length; i++) { - if(i > 0) sb.append(';'); + if(i > 0) sb.append(separator); sb.append(tags[i]); } setValue(sb.toString()); @@ -138,4 +139,16 @@ return false; } } + + public char getSeparator() { + XAttribute a =3D getAttribute(); + if(a =3D=3D null && getAttributeData() !=3D null) { + a =3D getAttributeData().getAttribute(); + } + if(a !=3D null) { + String s =3D a.getProperty("separator"); + if("comma".equals(s)) return ','; + } + return ';'; + } } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/attribute/editor/CheckListFieldEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/CheckListFieldEditor.java 2009-09-14 16:= 17:42 UTC (rev 17548) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/CheckListFieldEditor.java 2009-09-14 16:= 18:22 UTC (rev 17549) @@ -12,10 +12,13 @@ = import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.HashSet; +import java.util.Set; import java.util.StringTokenizer; = import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.IValueProvider; +import org.jboss.tools.common.model.ui.attribute.adapter.CheckListAdapter; import org.jboss.tools.common.model.ui.wizards.query.list.TreeItemSelectio= nManager; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.viewers.IContentProvider; @@ -42,6 +45,8 @@ = private String stringValue; private TreeViewer viewer; + + String separator =3D ";"; = public CheckListFieldEditor() {} = @@ -128,6 +133,9 @@ contentProvider =3D (IContentProvider)propertyEditor.getAdapter(ITreeCo= ntentProvider.class); labelProvider =3D (ILabelProvider)propertyEditor.getAdapter(ILabelProvi= der.class); // Object input =3D propertyEditor.getInput(); + if(propertyEditor.getInput() instanceof CheckListAdapter) { + separator =3D "" + ((CheckListAdapter)propertyEditor.getInput()).getSe= parator(); + } } init(); } @@ -148,15 +156,15 @@ lock++; Tree tree =3D viewer.getTree(); TreeItem[] is =3D tree.getItems(); + Set vs =3D new HashSet(); + StringTokenizer values =3D new StringTokenizer(stringValue, ";,"); /= /$NON-NLS-1$ + while(values.hasMoreTokens()) { + String n =3D values.nextToken(); + vs.add(n); + } for (int i =3D 0; i < is.length; i++) { Object d =3D is[i].getData(); - StringTokenizer values =3D new StringTokenizer(stringValue, ";,"); = //$NON-NLS-1$ - while(values.hasMoreTokens()) { - String n =3D values.nextToken(); - if(n.equals(d)) { - is[i].setChecked(true); - } - } + is[i].setChecked(vs.contains(d)); } lock--; } @@ -182,12 +190,12 @@ if (value.equals(currentItem)) currentItemExists =3D true; else { - if(newValue.length() > 0 && !newValue.endsWith(";") && !newValue.endsW= ith(",")) newValue +=3D ";"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if(newValue.length() > 0 && !newValue.endsWith(";") && !newValue.endsW= ith(",")) newValue +=3D separator; //$NON-NLS-1$ //$NON-NLS-2$ newValue +=3D value; } } if (!currentItemExists) { - if(newValue.length() > 0 && !newValue.endsWith(";") && !newValue.endsWi= th(",")) newValue +=3D ";"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if(newValue.length() > 0 && !newValue.endsWith(";") && !newValue.endsWi= th(",")) newValue +=3D separator; //$NON-NLS-1$ //$NON-NLS-2$ newValue +=3D currentItem; } valueChanged(newValue); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2009-09-14 16:1= 7:42 UTC (rev 17548) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2009-09-14 16:1= 8:22 UTC (rev 17549) @@ -256,6 +256,7 @@ = = SimpleContentProposalProvider cpp =3D new SimpleContentProposalProvider= (set.toArray(new String[0])); + cpp.setFiltering(true); KeyStroke ks =3D AttributeContentProposalProviderFactory.getCtrlSpaceKe= yStroke(); = ContentProposalAdapter adapter =3D new ContentProposalAdapter( --===============7626745031587518802==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 12:36:00 2009 Content-Type: multipart/mixed; boundary="===============3832106362237919460==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17550 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor. Date: Mon, 14 Sep 2009 12:36:00 -0400 Message-ID: <200909141636.n8EGa01k018361@svn01.web.mwc.hst.phx2.redhat.com> --===============3832106362237919460== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-14 12:36:00 -0400 (Mon, 14 Sep 2009) New Revision: 17550 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/attribute/editor/CheckListFieldEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-2607 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/attribute/editor/CheckListFieldEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/CheckListFieldEditor.java 2009-09-14 16:= 18:22 UTC (rev 17549) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/CheckListFieldEditor.java 2009-09-14 16:= 36:00 UTC (rev 17550) @@ -16,6 +16,7 @@ import java.util.Set; import java.util.StringTokenizer; = +import org.jboss.tools.common.model.ui.IAttributeErrorProvider; import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.IValueProvider; import org.jboss.tools.common.model.ui.attribute.adapter.CheckListAdapter; @@ -123,6 +124,7 @@ = public void setEnabled(boolean enabled){ super.setEnabled(enabled); + updateErrorState(); } = public void setPropertyEditor(IPropertyEditor propertyEditor) { @@ -133,6 +135,7 @@ contentProvider =3D (IContentProvider)propertyEditor.getAdapter(ITreeCo= ntentProvider.class); labelProvider =3D (ILabelProvider)propertyEditor.getAdapter(ILabelProvi= der.class); // Object input =3D propertyEditor.getInput(); + setErrorProvider((IAttributeErrorProvider)propertyEditor.getAdapter(IAt= tributeErrorProvider.class)); if(propertyEditor.getInput() instanceof CheckListAdapter) { separator =3D "" + ((CheckListAdapter)propertyEditor.getInput()).getSe= parator(); } @@ -142,6 +145,7 @@ = int lock =3D 0; public void propertyChange(PropertyChangeEvent event) { + super.propertyChange(event); valueProvider.removeValueChangeListener(this); if (IPropertyEditor.VALUE.equals(event.getPropertyName())) { Object v =3D event.getNewValue(); @@ -244,4 +248,5 @@ = public void delete() { } + } --===============3832106362237919460==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 12:37:01 2009 Content-Type: multipart/mixed; boundary="===============3222499936000567711==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17551 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml: resources/meta and 2 other directories. Date: Mon, 14 Sep 2009 12:37:00 -0400 Message-ID: <200909141637.n8EGb0V6018856@svn01.web.mwc.hst.phx2.redhat.com> --===============3222499936000567711== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-14 12:37:00 -0400 (Mon, 14 Sep 2009) New Revision: 17551 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss= /tools/hibernate/xml/model/GrantActionsConstraint.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss= /tools/hibernate/xml/model/handlers/AddPropertySupport.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/met= a/hibconfig3.meta Log: https://jira.jboss.org/jira/browse/JBIDE-2607 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin= .xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin.xml 2= 009-09-14 16:36:00 UTC (rev 17550) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin.xml 2= 009-09-14 16:37:00 UTC (rev 17551) @@ -101,6 +101,11 @@ = + + = + = \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resour= ces/meta/hibconfig3.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/me= ta/hibconfig3.meta 2009-09-14 16:36:00 UTC (rev 17550) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/me= ta/hibconfig3.meta 2009-09-14 16:37:00 UTC (rev 17551) @@ -633,9 +633,21 @@ - + name=3D"entity-name" xmlname=3D"entity-name"> + + + + + + + + + + + + @@ -1097,7 +1109,12 @@ + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.connection.poo= l_size" name=3D"pool size"> + + + + + @@ -1148,13 +1165,23 @@ + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.jdbc.batch_siz= e" name=3D"batch size"> + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.jdbc.fetch_siz= e" name=3D"fetch size"> + + + + + - @@ -1307,7 +1334,10 @@ + name=3D"name" xmlname=3D"name"> + + + Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/j= boss/tools/hibernate/xml/model/GrantActionsConstraint.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jbos= s/tools/hibernate/xml/model/GrantActionsConstraint.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jbos= s/tools/hibernate/xml/model/GrantActionsConstraint.java 2009-09-14 16:37:00= UTC (rev 17551) @@ -0,0 +1,37 @@ +/*************************************************************************= ****** + * 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.hibernate.xml.model; + +import java.util.StringTokenizer; + +import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintALi= st; + +public class GrantActionsConstraint extends XAttributeConstraintAList { + static String WILD_CARD =3D "*"; //$NON-NLS-1$ + static String MESSAGE =3D "value must be * or combination of read,insert,= update,delete"; //$NON-NLS-1$ + + public boolean accepts(String value) { + if(value.indexOf(WILD_CARD) >=3D 0 && !value.equals(WILD_CARD)) { + return false; + } + StringTokenizer st =3D new StringTokenizer(value, ","); //$NON-NLS= -1$ + while(st.hasMoreTokens()) { + String t =3D st.nextToken().trim(); + if(!values.contains(t)) return false; + } + return true; + } + + public String getError(String value) { + return accepts(value) ? null : MESSAGE; + } + +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .xml/src/org/jboss/tools/hibernate/xml/model/GrantActionsConstraint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/j= boss/tools/hibernate/xml/model/handlers/AddPropertySupport.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jbos= s/tools/hibernate/xml/model/handlers/AddPropertySupport.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jbos= s/tools/hibernate/xml/model/handlers/AddPropertySupport.java 2009-09-14 16:= 37:00 UTC (rev 17551) @@ -0,0 +1,61 @@ +package org.jboss.tools.hibernate.xml.model.handlers; + +import java.util.Properties; + +import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator; +import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; +import org.jboss.tools.common.meta.action.impl.WizardDataValidator; +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandl= er; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants; +import org.jboss.tools.hibernate.xml.model.impl.ComplexAttrUtil; + +public class AddPropertySupport extends SpecialWizardSupport { + + public AddPropertySupport() {} + + public void action(String name) throws XModelException { + if(FINISH.equals(name)) { + execute(); + setFinished(true); + } else if(CANCEL.equals(name)) { + setFinished(true); + } + } + = + public String[] getActionNames(int stepId) { + return new String[]{FINISH, CANCEL}; + } + + void execute() throws XModelException { + Properties p =3D extractStepData(0); + String entity =3D getEntityData()[0].getModelEntity().getName(); + XModelObject o =3D getTarget().getModel().createModelObject(entity, p); + DefaultCreateHandler.addCreatedObject(getTarget(), o, getProperties()); + } + + public WizardDataValidator getValidator(int step) { + validator.setSupport(this, step); + return validator; + } + + Validator validator =3D new Validator(); + + class Validator extends DefaultWizardDataValidator { + public void validate(Properties data) { + super.validate(data); + String name =3D data.getProperty(XMLStoreConstants.ATTR_NAME); + String value =3D data.getProperty(XMLStoreConstants.ATTR_VALUE); + XAttribute attr =3D ComplexAttrUtil.findComplexAttr(getTarget(), name); + if(attr !=3D null) { + String error =3D DefaultCreateHandler.getConstraintMessage(name, value= , attr.getConstraint()); + if(error !=3D null) { + message =3D error; + } + } + } + } + +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .xml/src/org/jboss/tools/hibernate/xml/model/handlers/AddPropertySupport.ja= va ___________________________________________________________________ Name: svn:mime-type + text/plain --===============3222499936000567711==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 12:38:53 2009 Content-Type: multipart/mixed; boundary="===============0529374957371808211==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17552 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui: src/org/jboss/tools/hibernate/ui/xml/editor and 1 other directories. Date: Mon, 14 Sep 2009 12:38:53 -0400 Message-ID: <200909141638.n8EGcr4m019195@svn01.web.mwc.hst.phx2.redhat.com> --===============0529374957371808211== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-14 12:38:53 -0400 (Mon, 14 Sep 2009) New Revision: 17552 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jb= oss/tools/hibernate/ui/xml/editor/PropertyListAdapter.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plugin.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jb= oss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java Log: https://jira.jboss.org/jira/browse/JBIDE-2607 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plu= gin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plugin.xm= l 2009-09-14 16:37:00 UTC (rev 17551) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/plugin.xm= l 2009-09-14 16:38:53 UTC (rev 17552) @@ -54,4 +54,13 @@ + + + + + + + + + Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/or= g/jboss/tools/hibernate/ui/xml/editor/PropertyListAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/j= boss/tools/hibernate/ui/xml/editor/PropertyListAdapter.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/j= boss/tools/hibernate/ui/xml/editor/PropertyListAdapter.java 2009-09-14 16:3= 8:53 UTC (rev 17552) @@ -0,0 +1,55 @@ +package org.jboss.tools.hibernate.ui.xml.editor; + +import java.util.TreeSet; + +import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.XChild; +import org.jboss.tools.common.meta.XModelEntity; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.ui.attribute.IListContentProvider; +import org.jboss.tools.common.model.ui.attribute.adapter.DefaultComboBoxVa= lueAdapter; +import org.jboss.tools.common.model.ui.attribute.adapter.DefaultXAttribute= ListContentProvider; +import org.jboss.tools.hibernate.ui.xml.form.HibConfig3PropertyFormLayoutD= ata; +import org.jboss.tools.hibernate.xml.model.impl.HibConfigComplexPropertyIm= pl; + +public class PropertyListAdapter extends DefaultComboBoxValueAdapter { + + protected IListContentProvider createListContentProvider(XAttribute attri= bute) { + PropertyListContentProvider p =3D new PropertyListContentProvider(); + p.setContext(modelObject); + p.setAttribute(attribute); + return p; = + } + +} + +class PropertyListContentProvider extends DefaultXAttributeListContentProv= ider { + private XModelObject context; + = + public void setContext(XModelObject context) { + this.context =3D context; + } + + protected void loadTags() { + XModelObject f =3D context; + XModelEntity ent =3D f.getModelEntity().getMetaModel().getEntity(HibConf= ig3PropertyFormLayoutData.PROPERTY_FOLDER_ENTITY); + if(ent =3D=3D null) return; + XChild[] cs =3D ent.getChildren(); + TreeSet set =3D new TreeSet(); + + for (int i =3D 0; i < cs.length; i++) { + XModelEntity e =3D f.getModelEntity().getMetaModel().getEntity(cs[i].ge= tName()); + XAttribute[] as =3D e.getAttributes(); + for (int j =3D 0; j < as.length; j++) { + String prop =3D as[j].getProperty(HibConfigComplexPropertyImpl.H_PROPE= RTY); + if(prop !=3D null && prop.length() > 0) { + set.add(prop); + } + } + } + = + tags =3D set.toArray(new String[0]); = + } + = +} + Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/PropertyListAdapter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src= /org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/j= boss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java 2009= -09-14 16:37:00 UTC (rev 17551) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/j= boss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java 2009= -09-14 16:38:53 UTC (rev 17552) @@ -19,6 +19,7 @@ */ public class HibConfig3PropertyFormLayoutData { static String PROPERTY_ENTITY =3D "HibConfig3Property"; //$NON-NLS-1$ + public static String PROPERTY_FOLDER_ENTITY =3D "HibConfig3PropertiesFold= er"; //$NON-NLS-1$ = final static IFormData PROPERTY_LIST_DEFINITION =3D new FormData( Messages.HibConfig3PropertyFormLayoutData_List, @@ -32,7 +33,7 @@ final static IFormData PROPERTY_FOLDER_DEFINITION =3D new FormData( Messages.HibConfig3PropertyFormLayoutData_Folder, "", //"Description //$NON-NLS-1$ - "HibConfig3PropertiesFolder", //$NON-NLS-1$ + PROPERTY_FOLDER_ENTITY, new FormAttributeData[]{new FormAttributeData("name", 100, Messages.HibC= onfig3PropertyFormLayoutData_Name)}, //$NON-NLS-1$ new String[]{PROPERTY_ENTITY}, Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.= AddProperty") //$NON-NLS-1$ --===============0529374957371808211==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 12:39:06 2009 Content-Type: multipart/mixed; boundary="===============6846356178436732504==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17553 - in trunk/documentation/whatsnew: as and 6 other directories. Date: Mon, 14 Sep 2009 12:39:05 -0400 Message-ID: <200909141639.n8EGd5q0019235@svn01.web.mwc.hst.phx2.redhat.com> --===============6846356178436732504== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: max.andersen(a)jboss.com Date: 2009-09-14 12:39:05 -0400 (Mon, 14 Sep 2009) New Revision: 17553 Added: trunk/documentation/whatsnew/as/as-news-3.1.0.M3.html trunk/documentation/whatsnew/core/core-news-3.1.0.M3.html trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html trunk/documentation/whatsnew/images/build_project_archives_action.png trunk/documentation/whatsnew/images/config_variable_in_filefilter.png trunk/documentation/whatsnew/images/css_properties_perspective.png trunk/documentation/whatsnew/images/default_fileset_for_servers.png trunk/documentation/whatsnew/images/forid_like_codeassist.png trunk/documentation/whatsnew/images/hc_pending_icon.png trunk/documentation/whatsnew/images/hibernate_rulers_grid_snap2geometry.= jpg trunk/documentation/whatsnew/images/hibernatenamedquerydaliui.png trunk/documentation/whatsnew/images/jbosslogo_server.png trunk/documentation/whatsnew/images/maven_library_provider.png trunk/documentation/whatsnew/images/new_hbm_xml_selection.png trunk/documentation/whatsnew/images/properties_regular_expression.png trunk/documentation/whatsnew/images/scrollable_toolbars.png trunk/documentation/whatsnew/images/selectionbar_optimized.png trunk/documentation/whatsnew/images/tagdocs.png trunk/documentation/whatsnew/jst/jst-news-3.1.0.M3.html trunk/documentation/whatsnew/maven/maven-news-1.0.0.M3.html trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M3.html Modified: trunk/documentation/whatsnew/index.html Log: new and noteworthy for M3 Added: trunk/documentation/whatsnew/as/as-news-3.1.0.M3.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/as/as-news-3.1.0.M3.html = (rev 0) +++ trunk/documentation/whatsnew/as/as-news-3.1.0.M3.html 2009-09-14 16:39:= 05 UTC (rev 17553) @@ -0,0 +1,95 @@ + + + + +JBoss AS Tools 2.1.0.M3 News + + + + +

JBoss AS Tools 3.1.0.M3 - New and Noteworthy

+ +

< Main Index Hibernate Tools >

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = +

+ + Server + +
+ + Configure filesets for Servers	+ There is now a preference page for configuring default filesets f= or server types. + + + + This can be used to setup which files inside the server configura= tion you wish to have easy access from the Server view, i.e. define */-lo= g4j.xml for JBoss servers if you want to easily access the logging configur= ation files. + + = Related jira +
+ +
+ + JBoss configuration Variable	+ You can now use `${jboss_config}` to refer to the sele= cted JBoss Configuration to allow for portable filesets. + + + Since this variable is an Eclipse Variable it can even be + used in launch configurations and similar places. Here a + specific server/runtime needs to be named, + i.e. `${jboss_config:JMyBoss4}`. + + = Related jira +
+ +
+ + Updated icons/images to new JBoss logo	+ The new wizards for Server types now uses the new JBoss logo + + + + = Related jira +
+ +

+ + + + + + Added: trunk/documentation/whatsnew/core/core-news-3.1.0.M3.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/core/core-news-3.1.0.M3.html = (rev 0) +++ trunk/documentation/whatsnew/core/core-news-3.1.0.M3.html 2009-09-14 16= :39:05 UTC (rev 17553) @@ -0,0 +1,90 @@ + + + + + + + +What's New + + +

What's New Core/General

+ +

< Main Index JST Tools >

+ + + + + + + + + = + + + + + + + + + + + + + + + + + +

+ + Project Archives + +
Nested archives now supports incremental updates	+ Previously nested project archives were possible to define, but updat= es in a nested archive were not always happening. + + This is now fixed allowing you to have structures like the following:= + + + + x.jar + ear/x.ear + ear/x.ear/x.jar = + + And when updating x.jar in the top-level the ear project's version of= x.jar will now also be updated. + + Related Jira= + +
+
Build Project Archive Action	+ There is now a "Build Project Archive" action which users can configu= re a hotkey for if they wish. + When invoked the project for the currently selected resource will be = built. + + + Related Jira= + +
+ + Properties editor + +
Filter/Search Regular Expression	+ The JBoss Tools properties editor's filter field now supports regular= expressions. + + + + By default the Name and Value fields are just substring seach, but if= you enable "Expressions" you can use regular expressions. + + Related Jira= +

+ + + + + + Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html = (rev 0) +++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html 200= 9-09-14 16:39:05 UTC (rev 17553) @@ -0,0 +1,157 @@ + + + + + + + +Hibernate tools 3.3.0.M3 What's New + + +

Hibernate tools 3.3.0.M3 What's New

+ +

< Main Index Maven Tools >

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + Dali Integration + +
Validation via NamingStrategy	+ When using Hibernate Platform with Dali (JPA Tooling) we now valida= te through the chosen NamingStrategy (if none chosen the default NamingStra= tegy is used). + + This allows those users who have custom naming strategies in place = to utilize the nice Dali JPA validation of wether the reference table and c= olumn names are enabled. + + Note: Remember for Dali validation to work you have to enable the J= PA facet on your project and have the chosen DTP connection be connected to= the database. If not, Dali will not perform any validation! + + In case you do not want the NamingStrategy to be used, i.e. your Na= mingStrategy requires custom setup or have dependencies not available durin= g design time you can disable the use of it on the Hibernate project prefer= ence page. + + + + Releated jiras: 1, 2 + +
+ +
Hibernate specific annotations	+ The JPA UI and validation has been extended to cover a few more Hib= ernate specific annotations. + + + `@GenericGenerators` (before only supported the singu= lar `@GenericGenerator` + `@DiscriminatorFormula` + `@NamedQuery` + `@NamedNativeQuery` + `@Embeddable` with associations (not allowed in JPA s= pec, but ok in Hibernate) + + + This means that these annotations now have UI support and if possib= le also validated in Dali. + + This screenshot shows a @NamedQuery being edited/shown in the UI. + + + + + + + Releated jiras: 1, 2,3, 4, 5 + + +
+ + Wizards + +
hbm.xml Wizard now generates mapping for object graph	+ When using New Hibernate Mapping wizard the generated hbm.xml now c= ontains basic mappings for properties and associations. + + + + You can select a package or multiple individual classes and then from t= here the wizard will traverse the object graph and generate mappings for th= e full object graph. + Rel= ated jira + +
+ + Views + +
Pending... node	+ Creation/opening of a Console Configuration is now visualized with = a Pending... node until it completes. + + + + Rel= ated jira + +
+ +
Mapping Diagram	+ The mapping diagram now has support for showing Grid, Rules and Sna= p-to-Geometry. + + + + Rel= ated jira + +
+ +

+ + + + + + Added: trunk/documentation/whatsnew/images/build_project_archives_action.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/build_project_arch= ives_action.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/config_variable_in_filefilter.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/config_variable_in= _filefilter.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/css_properties_perspective.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/css_properties_per= spective.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/default_fileset_for_servers.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/default_fileset_fo= r_servers.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/forid_like_codeassist.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/forid_like_codeass= ist.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/hc_pending_icon.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/hc_pending_icon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/hibernate_rulers_grid_snap2geome= try.jpg =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/hibernate_rulers_g= rid_snap2geometry.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/hibernatenamedquerydaliui.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/hibernatenamedquer= ydaliui.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/jbosslogo_server.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/jbosslogo_server.p= ng ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/maven_library_provider.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/maven_library_prov= ider.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/new_hbm_xml_selection.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/new_hbm_xml_select= ion.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/properties_regular_expression.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/properties_regular= _expression.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/scrollable_toolbars.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/scrollable_toolbar= s.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/selectionbar_optimized.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/selectionbar_optim= ized.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/tagdocs.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/tagdocs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/documentation/whatsnew/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/index.html 2009-09-14 16:38:53 UTC (rev 17= 552) +++ trunk/documentation/whatsnew/index.html 2009-09-14 16:39:05 UTC (rev 17= 553) @@ -24,6 +24,19 @@ = +

3.1.0.M3 = + = +

= +

= +

= +

= +

= +

+ = + + + +

3.1.0.M2 = =

Core/General

= Added: trunk/documentation/whatsnew/jst/jst-news-3.1.0.M3.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/jst/jst-news-3.1.0.M3.html = (rev 0) +++ trunk/documentation/whatsnew/jst/jst-news-3.1.0.M3.html 2009-09-14 16:3= 9:05 UTC (rev 17553) @@ -0,0 +1,103 @@ + + + + + + + +JST/JSF 3.1.0.M3 What's New + + +

JST/JSF 3.1.0.M3 What's New

+ +

< Main Index Server Tools >

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + OpenOn + +
+ EL Variables	OpenOn's are now available for source elements= . + + Re= lated Jira +
+ + Code assist + +
+ Unified EL completion for Seam and JSF projects	EL completion for Seam and JSF projects are no= w unified (uses same codebase). + + In previous releases there were small differences between how code comp= letion were done for projects with or without Seam configured, i.e. code co= mpletion for Seam variables were not available in Wizards and property shee= ts and some of the features of JBoss EL were not honored in JSF projects. + + Related jiras: 1, 2 +
+
+ EL completion in style attributes	Code assist for EL variables are now available= in style attributes of XHTML files. + + Re= lated Jira +
+
+ Information hover for JSF tags	When code completing JSF/Facelets tags we now = show a information box with the related tag documentation. Descriptions are= fetched from TLD and facelet information. + + + + Rel= ated Jira +
+
+ Code assist for attributes expecting an ID in richfaces	Code assist now provides id completion for att= ributes that is known to work with ID's (for, focus, reRender, etc.). Both = single and multi-valued (comma separated) completion are supported. + + + = + = + Re= lated Jira +
+

+ + + + Added: trunk/documentation/whatsnew/maven/maven-news-1.0.0.M3.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/maven/maven-news-1.0.0.M3.html = (rev 0) +++ trunk/documentation/whatsnew/maven/maven-news-1.0.0.M3.html 2009-09-14 = 16:39:05 UTC (rev 17553) @@ -0,0 +1,69 @@ + + + + + + + +What's New in Maven Tools + + +

Maven Tools

+ +

< Main Index VPE Tools >

+ + + + + + + + + + + + + + + + + + + + + + +

+ + Maven Integration + +
Maven WTP 3.1 Library Providers	+ When creating or editing WTP projects with JBoss Tools Maven Integrat= ion enabled it is now possible to use Maven as the library provider. + + + + For this release only the JSF facet have this enabled, but in future re= leases we will add more facet specific defaults (i.e. portal, seam, etc.).<= /p> + + Note: be sure to use the latest m2eclipse development release with JB= oss Tools for this to work. + Related Jira= +
+ +
Seam now looks at root.xml for dependencies	+ The Maven integration for Seam now get all its dependencies based on = the POM file named build/root.xml. + This ensures your project will be created with the same dependencies = as the version of Seam you use in the tooling. + + + Related Jira= +
+ +

+ + + + + + Added: trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M3.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M3.html = (rev 0) +++ trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M3.html 2009-09-14 16:3= 9:05 UTC (rev 17553) @@ -0,0 +1,138 @@ + + + + + + + +What's New Visual Page Editor + + +

What's New Visual Page Editor

+ +

< Main Index Core Tools >

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + CSS Editing + +
CSS Perspective	+ There is now a CSS Editing perspective that provides a default layout= showing the CSS Properties and CSS Preview views. + Good when editing .css files where these views has their use. + + + = + Related Jira= +
+ +
+ + Facelets + +
Custom components in .jar	+ Support for custom components previously only + worked for exploded directory structure, it now also + work when you are using custom components from a + jar. + + Related Jira= +
+ +
Toolbar for smaller screens	+ The toolbar and selection bar in Visual Page Editor now "collapses" s= eamlessly when there is less space available for it. A small arrow is shown= when needed and can be used to access the non-visible parts. + + + Related Jira= +
+ +
Selection bar optimized	+ The selection bar is now not updating on every change, but only whe= n it needs to - making it faster and not flickering when scrolling or typin= g. + + + Related Jira= +
+ +
More components	+ New Richfaces 3.3.1 and standard jsp/JSTL core and functions are now = rendered visually in the page editor. + + Related Jira= +
OpenOn for tag libs	+ Files referenced in the `source` tag's of a facelet librar= y definition can now be open with OpenOn (F3 or Ctrl+Mouse). + + Related Jira= +
+ +

+ + + + + + --===============6846356178436732504==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 13:21:07 2009 Content-Type: multipart/mixed; boundary="===============0238800491356960831==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17554 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta. Date: Mon, 14 Sep 2009 13:21:07 -0400 Message-ID: <200909141721.n8EHL7aw031287@svn01.web.mwc.hst.phx2.redhat.com> --===============0238800491356960831== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-14 13:21:07 -0400 (Mon, 14 Sep 2009) New Revision: 17554 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/met= a/hibconfig3.meta Log: https://jira.jboss.org/jira/browse/JBIDE-2607 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resour= ces/meta/hibconfig3.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/me= ta/hibconfig3.meta 2009-09-14 16:39:05 UTC (rev 17553) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/me= ta/hibconfig3.meta 2009-09-14 17:21:07 UTC (rev 17554) @@ -1072,7 +1072,8 @@ - + @@ -1088,25 +1089,14 @@ - - - - - - - - - - + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.connection.url= " name=3D"url"/> + @@ -1116,11 +1106,26 @@ + PROPERTIES=3D"category=3Dadvanced;h_property=3Dhibernate.connection" n= ame=3D"connection"/> + + + + + + + + + + + + PROPERTIES=3D"category=3Dadvanced;h_property=3Dhibernate.connection.re= lease_mode" name=3D"release mode"> @@ -1130,10 +1135,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.dialect" name= =3D"dialect"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.show_sql" name= =3D"show sql"> + + + + + + + + + + + + + + + + + + + + + + + @@ -1273,15 +1360,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + --===============0238800491356960831==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 13:21:34 2009 Content-Type: multipart/mixed; boundary="===============8058816818123930102==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17555 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form. Date: Mon, 14 Sep 2009 13:21:34 -0400 Message-ID: <200909141721.n8EHLY0E031391@svn01.web.mwc.hst.phx2.redhat.com> --===============8058816818123930102== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-14 13:21:34 -0400 (Mon, 14 Sep 2009) New Revision: 17555 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jb= oss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java Log: https://jira.jboss.org/jira/browse/JBIDE-2607 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src= /org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/j= boss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java 2009-09-14 1= 7:21:07 UTC (rev 17554) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/j= boss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutData.java 2009-09-14 1= 7:21:34 UTC (rev 17555) @@ -10,14 +10,19 @@ *************************************************************************= *****/ = package org.jboss.tools.hibernate.ui.xml.form; = +import java.util.ArrayList; import java.util.Collections; +import java.util.List; import java.util.Map; = +import org.jboss.tools.common.meta.XModelEntity; +import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; import org.jboss.tools.common.model.ui.forms.ArrayToMap; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.IFormData; import org.jboss.tools.common.model.ui.forms.IFormLayoutData; +import org.jboss.tools.common.model.ui.forms.ModelFormLayoutData; import org.jboss.tools.common.model.util.ClassLoaderUtil; = public class Hibernate3FormLayoutData implements IFormLayoutData { @@ -146,7 +151,7 @@ = }; = - private static Map FORM_LAYOUT_DEFINITION_MAP =3D Collections.unmodifiabl= eMap(new ArrayToMap(FORM_LAYOUT_DEFINITIONS)); + private static Map FORM_LAYOUT_DEFINITION_MAP =3D Collections.synchronize= dMap(new ArrayToMap(FORM_LAYOUT_DEFINITIONS)); = static Hibernate3FormLayoutData INSTANCE =3D new Hibernate3FormLayoutData= (); = @@ -157,7 +162,36 @@ public Hibernate3FormLayoutData() {} = public IFormData getFormData(String entityName) { - return (IFormData)FORM_LAYOUT_DEFINITION_MAP.get(entityName); + IFormData data =3D (IFormData)FORM_LAYOUT_DEFINITION_MAP.get(entityName); + if(data =3D=3D null) { + data =3D generateDefaultFormData(entityName); + } + return data; } + = + private IFormData generateDefaultFormData(String entityName) { + IFormData data =3D null; + XModelEntity entity =3D XModelMetaDataImpl.getInstance().getEntity(entit= yName); + if(entity !=3D null) { + data =3D generateDefaultFormData(entity); + } + if(data !=3D null) { + FORM_LAYOUT_DEFINITION_MAP.put(entityName, data); + } + return data; = + } + = + private IFormData generateDefaultFormData(XModelEntity entity) { + String entityName =3D entity.getName(); + List list =3D new ArrayList(); + IFormData g =3D ModelFormLayoutData.createGeneralFormData(entity); + if(g !=3D null) list.add(g); = + IFormData a =3D ModelFormLayoutData.createAdvancedFormData(entityName); + if(a !=3D null) list.add(a); + IFormData[] ds =3D list.toArray(new IFormData[0]); + IFormData data =3D new FormData(entityName, new String[]{null}, ds); + return data; + } + } --===============8058816818123930102==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:23:20 2009 Content-Type: multipart/mixed; boundary="===============3246188117215873963==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17556 - in trunk: cdi and 1 other directories. Date: Mon, 14 Sep 2009 15:23:20 -0400 Message-ID: <200909141923.n8EJNKuP023468@svn01.web.mwc.hst.phx2.redhat.com> --===============3246188117215873963== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:23:20 -0400 (Mon, 14 Sep 2009) New Revision: 17556 Added: trunk/cdi/ trunk/cdi/plugins/ trunk/cdi/plugins/org.jboss.tools.cdi.core/ Log: Share project "org.jboss.tools.cdi.core" into "https://svn.jboss.org/repos/= jbosstools" --===============3246188117215873963==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:24:15 2009 Content-Type: multipart/mixed; boundary="===============9184982922126031086==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17557 - in trunk/cdi/plugins/org.jboss.tools.cdi.core: .settings and 7 other directories. Date: Mon, 14 Sep 2009 15:24:15 -0400 Message-ID: <200909141924.n8EJOFVK023572@svn01.web.mwc.hst.phx2.redhat.com> --===============9184982922126031086== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:24:15 -0400 (Mon, 14 Sep 2009) New Revision: 17557 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath trunk/cdi/plugins/org.jboss.tools.cdi.core/.project trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/ trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt.cor= e.prefs trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties trunk/cdi/plugins/org.jboss.tools.cdi.core/src/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDICorePlugin.java Log: Share project "org.jboss.tools.cdi.core" into "https://svn.jboss.org/repos/= jbosstools" Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath 2009-09-14 19:24:= 15 UTC (rev 17557) @@ -0,0 +1,7 @@ + + + + + + + Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/.project = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/.project 2009-09-14 19:24:15= UTC (rev 17557) @@ -0,0 +1,28 @@ + + + org.jboss.tools.cdi.core + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt= .core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt.co= re.prefs (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt.co= re.prefs 2009-09-14 19:24:15 UTC (rev 17557) @@ -0,0 +1,8 @@ +#Mon Sep 14 23:19:30 MSD 2009 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/o= rg.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-09= -14 19:24:15 UTC (rev 17557) @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-SymbolicName: org.jboss.tools.cdi.core +Bundle-Version: 1.0.0 +Bundle-Activator: org.jboss.tools.cdi.core.CDICorePlugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MA= NIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties 2009-09-14 = 19:24:15 UTC (rev 17557) @@ -0,0 +1,7 @@ +source.. =3D src/ +output.. =3D bin/ +bin.includes =3D plugin.xml,\ + META-INF/,\ + .,\ + OSGI-INF/l10n/bundle.properties +src.includes =3D src/ Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/build.prope= rties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/c= ore/CDICorePlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDICorePlugin.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDICorePlugin.java 2009-09-14 19:24:15 UTC (rev 17557) @@ -0,0 +1,61 @@ +package org.jboss.tools.cdi.core; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class CDICorePlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID =3D "org.jboss.tools.cdi.core"; + + // The shared instance + private static CDICorePlugin plugin; + = + /** + * The constructor + */ + public CDICorePlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.B= undleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin =3D this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.Bu= ndleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin =3D null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static CDICorePlugin getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jbo= ss/tools/cdi/core/CDICorePlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============9184982922126031086==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:25:29 2009 Content-Type: multipart/mixed; boundary="===============3122404303907809152==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17558 - trunk/cdi/plugins/org.jboss.tools.cdi.core. Date: Mon, 14 Sep 2009 15:25:29 -0400 Message-ID: <200909141925.n8EJPThO023993@svn01.web.mwc.hst.phx2.redhat.com> --===============3122404303907809152== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:25:29 -0400 (Mon, 14 Sep 2009) New Revision: 17558 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties Log: Share project "org.jboss.tools.cdi.core" into "https://svn.jboss.org/repos/= jbosstools" Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties 2009-09-14 = 19:24:15 UTC (rev 17557) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/build.properties 2009-09-14 = 19:25:29 UTC (rev 17558) @@ -2,6 +2,5 @@ output.. =3D bin/ bin.includes =3D plugin.xml,\ META-INF/,\ - .,\ - OSGI-INF/l10n/bundle.properties + . src.includes =3D src/ --===============3122404303907809152==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:28:35 2009 Content-Type: multipart/mixed; boundary="===============5268257846703087288==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17559 - trunk/cdi/plugins. Date: Mon, 14 Sep 2009 15:28:35 -0400 Message-ID: <200909141928.n8EJSZug024386@svn01.web.mwc.hst.phx2.redhat.com> --===============5268257846703087288== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:28:35 -0400 (Mon, 14 Sep 2009) New Revision: 17559 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/ Log: Share project "org.jboss.tools.cdi.ui" into "https://svn.jboss.org/repos/jb= osstools" --===============5268257846703087288==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:28:54 2009 Content-Type: multipart/mixed; boundary="===============8196005490061414010==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17560 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui: .settings and 7 other directories. Date: Mon, 14 Sep 2009 15:28:54 -0400 Message-ID: <200909141928.n8EJSsbF024428@svn01.web.mwc.hst.phx2.redhat.com> --===============8196005490061414010== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:28:54 -0400 (Mon, 14 Sep 2009) New Revision: 17560 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath trunk/cdi/plugins/org.jboss.tools.cdi.ui/.project trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.core.= prefs trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.ui/build.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/Acti= vator.java Log: Share project "org.jboss.tools.cdi.ui" into "https://svn.jboss.org/repos/jb= osstools" Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath 2009-09-14 19:28:54= UTC (rev 17560) @@ -0,0 +1,7 @@ + + + + + + + Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/.project = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/.project 2009-09-14 19:28:54 U= TC (rev 17560) @@ -0,0 +1,28 @@ + + + org.jboss.tools.cdi.ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.c= ore.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.core= .prefs (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.core= .prefs 2009-09-14 19:28:54 UTC (rev 17560) @@ -0,0 +1,8 @@ +#Mon Sep 14 23:26:36 MSD 2009 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org= .eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2009-09-1= 4 19:28:54 UTC (rev 17560) @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Context and Dependency Injection UI +Bundle-SymbolicName: org.jboss.tools.cdi.ui +Bundle-Version: 1.0.0 +Bundle-Activator: org.jboss.tools.cdi.ui.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.jboss.tools.cdi.core;bundle-version=3D"1.0.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANI= FEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/build.properties = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/build.properties 2009-09-14 19= :28:54 UTC (rev 17560) @@ -0,0 +1,8 @@ +source.. =3D src/ +output.. =3D bin/ +bin.includes =3D META-INF/,\ + . +src.includes =3D src/,\ + build.properties,\ + META-INF/,\ + .settings/ Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/build.propert= ies ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/= Activator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/Act= ivator.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/Act= ivator.java 2009-09-14 19:28:54 UTC (rev 17560) @@ -0,0 +1,50 @@ +package org.jboss.tools.cdi.ui; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID =3D "org.jboss.tools.cdi.ui"; + + // The shared instance + private static Activator plugin; + = + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.B= undleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin =3D this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.Bu= ndleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin =3D null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss= /tools/cdi/ui/Activator.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============8196005490061414010==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:49:35 2009 Content-Type: multipart/mixed; boundary="===============4686462042988449222==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17561 - in trunk/cdi: tests and 1 other directory. Date: Mon, 14 Sep 2009 15:49:35 -0400 Message-ID: <200909141949.n8EJnZ4K028485@svn01.web.mwc.hst.phx2.redhat.com> --===============4686462042988449222== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:49:34 -0400 (Mon, 14 Sep 2009) New Revision: 17561 Added: trunk/cdi/tests/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/ Log: Share project "org.jboss.tools.cdi.core.test" into "https://svn.jboss.org/r= epos/jbosstools" --===============4686462042988449222==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:49:57 2009 Content-Type: multipart/mixed; boundary="===============4268169232468133667==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17562 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: .settings and 8 other directories. Date: Mon, 14 Sep 2009 15:49:56 -0400 Message-ID: <200909141949.n8EJnuaB028533@svn01.web.mwc.hst.phx2.redhat.com> --===============4268169232468133667== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:49:56 -0400 (Mon, 14 Sep 2009) New Revision: 17562 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/.project trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.jdt.= core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/CDICoreAllTests.java Log: Share project "org.jboss.tools.cdi.core.test" into "https://svn.jboss.org/r= epos/jbosstools" Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath 2009-09-14 19:= 49:56 UTC (rev 17562) @@ -0,0 +1,7 @@ + + + + + + + Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpa= th ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/.project = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/.project 2009-09-14 19:49= :56 UTC (rev 17562) @@ -0,0 +1,28 @@ + + + org.jboss.tools.cdi.core.test + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.= jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.jdt= .core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.jdt= .core.prefs 2009-09-14 19:49:56 UTC (rev 17562) @@ -0,0 +1,8 @@ +#Mon Sep 14 23:36:44 MSD 2009 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.setting= s/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2009= -09-14 19:49:56 UTC (rev 17562) @@ -0,0 +1,9 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Contexts and Dependency Injection Test +Bundle-SymbolicName: org.jboss.tools.cdi.core.test +Bundle-Version: 1.0.0 +Bundle-Vendor: JBoss by Red Hat +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.jboss.tools.tests, + org.junit;bundle-version=3D"3.8.2" Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF= /MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.properties 2009-09-= 14 19:49:56 UTC (rev 17562) @@ -0,0 +1,4 @@ +source.. =3D src/ +output.. =3D bin/ +bin.includes =3D META-INF/,\ + . Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/build.pr= operties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cd= i/core/test/CDICoreAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreAllTests.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreAllTests.java 2009-09-14 19:49:56 UTC (rev 17562) @@ -0,0 +1,33 @@ +/*************************************************************************= ****** = + * 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.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.jboss.tools.tests.AbstractPluginsLoadTest; + +/** + * @author Alexey Kazakov + */ +public class CDICoreAllTests { + + public static Test suite() { + TestSuite suite =3D new TestSuite("CDI Core Tests"); + return suite; + } + + public class CDIPluginsLoadTest extends AbstractPluginsLoadTest { + public void testBundlesAreLoadedForSeamFeature(){ + testBundlesAreLoadedFor("org.jboss.tools.cdi.feature"); + } + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/= jboss/tools/cdi/core/test/CDICoreAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============4268169232468133667==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:51:11 2009 Content-Type: multipart/mixed; boundary="===============5827609579792615849==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17563 - in trunk/cdi/plugins: org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core and 2 other directories. Date: Mon, 14 Sep 2009 15:51:10 -0400 Message-ID: <200909141951.n8EJpAo8028967@svn01.web.mwc.hst.phx2.redhat.com> --===============5827609579792615849== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:51:10 -0400 (Mon, 14 Sep 2009) New Revision: 17563 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIU= IPlugin.java Removed: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/Acti= vator.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDICorePlugin.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF Log: Minor changes in initial classes for CDI tools. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-09= -14 19:49:56 UTC (rev 17562) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-09= -14 19:51:10 UTC (rev 17563) @@ -1,10 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name +Bundle-Name: Context and Dependency Injection Core Bundle-SymbolicName: org.jboss.tools.cdi.core Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.cdi.core.CDICorePlugin Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime + org.eclipse.core.runtime, + org.jboss.tools.common Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: JBoss by Red Hat Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDICorePlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDICorePlugin.java 2009-09-14 19:49:56 UTC (rev 17562) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDICorePlugin.java 2009-09-14 19:51:10 UTC (rev 17563) @@ -1,20 +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.cdi.core; = import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.common.log.BaseUIPlugin; import org.osgi.framework.BundleContext; = /** * The activator class controls the plug-in life cycle */ -public class CDICorePlugin extends AbstractUIPlugin { +public class CDICorePlugin extends BaseUIPlugin { = // The plug-in ID public static final String PLUGIN_ID =3D "org.jboss.tools.cdi.core"; = // The shared instance private static CDICorePlugin plugin; - = + /** * The constructor */ @@ -58,4 +68,4 @@ public static ImageDescriptor getImageDescriptor(String path) { return imageDescriptorFromPlugin(PLUGIN_ID, path); } -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2009-09-1= 4 19:49:56 UTC (rev 17562) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2009-09-1= 4 19:51:10 UTC (rev 17563) @@ -3,9 +3,11 @@ Bundle-Name: Context and Dependency Injection UI Bundle-SymbolicName: org.jboss.tools.cdi.ui Bundle-Version: 1.0.0 -Bundle-Activator: org.jboss.tools.cdi.ui.Activator +Bundle-Activator: org.jboss.tools.cdi.ui.CDIUIPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.cdi.core;bundle-version=3D"1.0.0" + org.jboss.tools.cdi.core, + org.jboss.tools.common Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: JBoss by Red Hat Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/u= i/Activator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/Act= ivator.java 2009-09-14 19:49:56 UTC (rev 17562) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/Act= ivator.java 2009-09-14 19:51:10 UTC (rev 17563) @@ -1,50 +0,0 @@ -package org.jboss.tools.cdi.ui; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID =3D "org.jboss.tools.cdi.ui"; - - // The shared instance - private static Activator plugin; - = - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.B= undleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin =3D this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.Bu= ndleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin =3D null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} Copied: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui= /CDIUIPlugin.java (from rev 17560, trunk/cdi/plugins/org.jboss.tools.cdi.ui= /src/org/jboss/tools/cdi/ui/Activator.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDI= UIPlugin.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDI= UIPlugin.java 2009-09-14 19:51:10 UTC (rev 17563) @@ -0,0 +1,60 @@ +/*************************************************************************= ****** = + * 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.ui; + +import org.jboss.tools.common.log.BaseUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class CDIUIPlugin extends BaseUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID =3D "org.jboss.tools.cdi.ui"; + + // The shared instance + private static CDIUIPlugin plugin; + = + /** + * The constructor + */ + public CDIUIPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.B= undleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin =3D this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.Bu= ndleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin =3D null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static CDIUIPlugin getDefault() { + return plugin; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss= /tools/cdi/ui/CDIUIPlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============5827609579792615849==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:57:59 2009 Content-Type: multipart/mixed; boundary="===============0954748212878822770==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17564 - trunk/cdi/tests. Date: Mon, 14 Sep 2009 15:57:59 -0400 Message-ID: <200909141957.n8EJvx94030069@svn01.web.mwc.hst.phx2.redhat.com> --===============0954748212878822770== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:57:59 -0400 (Mon, 14 Sep 2009) New Revision: 17564 Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/ Log: Share project "org.jboss.tools.cdi.ui.test" into "https://svn.jboss.org/rep= os/jbosstools" --===============0954748212878822770==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:58:52 2009 Content-Type: multipart/mixed; boundary="===============4162141965425180735==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17565 - in trunk/cdi/tests/org.jboss.tools.cdi.ui.test: .settings and 8 other directories. Date: Mon, 14 Sep 2009 15:58:52 -0400 Message-ID: <200909141958.n8EJwqqg030178@svn01.web.mwc.hst.phx2.redhat.com> --===============4162141965425180735== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:58:51 -0400 (Mon, 14 Sep 2009) New Revision: 17565 Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.project trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jdt.co= re.prefs trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core= /test/ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/core= /test/CDIUIAllTests.java Log: Share project "org.jboss.tools.cdi.ui.test" into "https://svn.jboss.org/rep= os/jbosstools" Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath 2009-09-14 19:58= :51 UTC (rev 17565) @@ -0,0 +1,7 @@ + + + + + + + Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.project = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.project 2009-09-14 19:58:5= 1 UTC (rev 17565) @@ -0,0 +1,28 @@ + + + org.jboss.tools.cdi.ui.test + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jd= t.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jdt.c= ore.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jdt.c= ore.prefs 2009-09-14 19:58:51 UTC (rev 17565) @@ -0,0 +1,8 @@ +#Mon Sep 14 23:52:48 MSD 2009 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/= org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2009-0= 9-14 19:58:51 UTC (rev 17565) @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Contexts and Dependency Injection UI Test +Bundle-SymbolicName: org.jboss.tools.cdi.ui.test +Bundle-Version: 1.0.0 +Bundle-Vendor: JBoss by Red Hat +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.junit, + org.jboss.tools.cdi.ui, + org.jboss.tools.tests Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/M= ANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2009-09-14= 19:58:51 UTC (rev 17565) @@ -0,0 +1,4 @@ +source.. =3D src/ +output.. =3D bin/ +bin.includes =3D META-INF/,\ + . Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.prop= erties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/= core/test/CDIUIAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/cor= e/test/CDIUIAllTests.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/cor= e/test/CDIUIAllTests.java 2009-09-14 19:58:51 UTC (rev 17565) @@ -0,0 +1,25 @@ +/*************************************************************************= ****** = + * 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.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author Alexey Kazakov + */ +public class CDIUIAllTests { + + public static Test suite() { + TestSuite suite =3D new TestSuite("CDI UI Tests"); + return suite; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jb= oss/tools/cdi/core/test/CDIUIAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============4162141965425180735==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 15:59:21 2009 Content-Type: multipart/mixed; boundary="===============8328886997092925146==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17566 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF. Date: Mon, 14 Sep 2009 15:59:21 -0400 Message-ID: <200909141959.n8EJxLYo030236@svn01.web.mwc.hst.phx2.redhat.com> --===============8328886997092925146== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 15:59:21 -0400 (Mon, 14 Sep 2009) New Revision: 17566 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF Log: Added dependency to core plug-in Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2009= -09-14 19:58:51 UTC (rev 17565) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2009= -09-14 19:59:21 UTC (rev 17566) @@ -6,4 +6,5 @@ Bundle-Vendor: JBoss by Red Hat Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.jboss.tools.tests, - org.junit;bundle-version=3D"3.8.2" + org.junit, + org.jboss.tools.cdi.core --===============8328886997092925146==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 18:16:38 2009 Content-Type: multipart/mixed; boundary="===============7687476929596923188==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17567 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver. Date: Mon, 14 Sep 2009 18:16:37 -0400 Message-ID: <200909142216.n8EMGbxl025859@svn01.web.mwc.hst.phx2.redhat.com> --===============7687476929596923188== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 18:16:37 -0400 (Mon, 14 Sep 2009) New Revision: 17567 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberElSegment.java Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELSegment.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegment.java 2009-09-14 19:59:21 UTC (rev 17566) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegment.java 2009-09-14 22:16:37 UTC (rev 17567) @@ -10,8 +10,9 @@ *************************************************************************= *****/ = package org.jboss.tools.common.el.core.resolver; = -import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.core.resources.IResource; import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.model.project.ext.ITextSourceReference; = /** * Describes a segment of EL operand. @@ -25,17 +26,17 @@ ELInvocationExpression getToken(); = /** - * @return member info object of resolved segment. May return null. + * @return true if the segment has been resolved. */ - TypeInfoCollector.MemberInfo getMemberInfo(); + boolean isResolved(); = /** - * @return Java Element which represent this resolve segment. May return = null. = + * @return resource of underlying object. */ - IJavaElement getJavaElement(); + IResource getResource(); = /** - * @return true if the segment has been resolved. + * @return source reference of underlying object. */ - boolean isResolved(); + ITextSourceReference getSourceReference(); } \ No newline at end of file Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/to= ols/common/el/core/resolver/JavaMemberElSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberElSegment.java (= rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberElSegment.java 2009-09-14 22:16:37 UTC (= rev 17567) @@ -0,0 +1,40 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +import org.eclipse.jdt.core.IJavaElement; + +/** + * Describes a segment of EL operand which is a Java Element. = + * @author Alexey Kazakov + */ +public interface JavaMemberElSegment extends ELSegment { + + /** + * @return member info object of resolved segment. May return null. + */ + TypeInfoCollector.MemberInfo getMemberInfo(); + + /** + * @return Java Element which represent this resolve segment. May return = null. = + */ + IJavaElement getJavaElement(); + + /** + * @return true if an underlying object is field and this field has gette= r. + */ + boolean hasGetter(); + + /** + * @return true if an underlying object is field and this field has sette= r. + */ + boolean hasSetter(); +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/sr= c/org/jboss/tools/common/el/core/resolver/JavaMemberElSegment.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7687476929596923188==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 18:20:20 2009 Content-Type: multipart/mixed; boundary="===============2020684171713562839==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17568 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text. Date: Mon, 14 Sep 2009 18:20:05 -0400 Message-ID: <200909142220.n8EMK5s3026083@svn01.web.mwc.hst.phx2.redhat.com> --===============2020684171713562839== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-14 18:20:05 -0400 (Mon, 14 Sep 2009) New Revision: 17568 Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/t= ext/TextProposal.java Log: JBIDE-512 context variable code completion dropdown should show their "sour= ce" JBIDE-2541 Show java-doc for EL content assist item The values of type, sourceType and JavaDoc are gathered to be displayed in = CA Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/c= ommon/text/TextProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= text/TextProposal.java 2009-09-14 22:16:37 UTC (rev 17567) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= text/TextProposal.java 2009-09-14 22:20:05 UTC (rev 17568) @@ -45,12 +45,31 @@ private int relevance =3D R_NONE; private int position =3D -1; private boolean autoActivationContentAssistantAfterApplication =3D false; - + = + private String type; + private String sourceType; + = private int start =3D -1; private int end =3D -1; = PostProcessing postProcessing; = + public String getType() { + return type; + } + = + public void setType(String typeName) { + this.type =3D typeName; + } + = + public String getSourceType() { + return sourceType; + } + = + public void setSourceType(String sourceTypeName) { + this.sourceType =3D sourceTypeName; + } + = /** * = * @return @@ -85,7 +104,19 @@ * @return */ public String getLabel() { - return label; + String l =3D label !=3D null ? label : getReplacementString() =3D=3D nul= l ? "" : getReplacementString(); //$NON-NLS-1$ + = + StringBuffer dispLabel =3D new StringBuffer(l); + if (type !=3D null) { + dispLabel.append(" : "); //$NON-NLS-1$ + dispLabel.append(type); + } + if (sourceType !=3D null) { + dispLabel.append(" - "); //$NON-NLS-1$ + dispLabel.append(sourceType); + } + = + return dispLabel.toString(); } = /** --===============2020684171713562839==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 18:22:39 2009 Content-Type: multipart/mixed; boundary="===============0301279508221105043==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17569 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist. Date: Mon, 14 Sep 2009 18:22:39 -0400 Message-ID: <200909142222.n8EMMdmj026551@svn01.web.mwc.hst.phx2.redhat.com> --===============0301279508221105043== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-14 18:22:38 -0400 (Mon, 14 Sep 2009) New Revision: 17569 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/FaceletPageContectAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/JspContentAssistProcessor.java Log: JBIDE-512 context variable code completion dropdown should show their "sour= ce" JBIDE-2541 Show java-doc for EL content assist item The values of type, sourceType and JavaDoc are gathered to be displayed in = CA Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/FaceletPageContectAssistProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/FaceletPageContectAssistProcessor.java 2009-09-14 22:20:05 UTC= (rev 17568) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/FaceletPageContectAssistProcessor.java 2009-09-14 22:22:38 UTC= (rev 17569) @@ -205,7 +205,13 @@ int cursorPosition =3D replacementString.length(); Image image =3D textProposal.getImage(); = - String displayString =3D prefix.getText().substring(0, replacementLengt= h) + textProposal.getReplacementString(); = + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> +// String displayString =3D prefix.getText().substring(0, replacementLen= gth) + textProposal.getReplacementString(); + String displayString =3D textProposal.getLabel(); + if (displayString =3D=3D null) + displayString =3D textProposal.getReplacementString() =3D=3D null ? re= placementString : textProposal.getReplacementString(); + + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes IContextInformation contextInformation =3D null; String additionalProposalInfo =3D textProposal.getContextInfo(); int relevance =3D textProposal.getRelevance(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/JspContentAssistProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/JspContentAssistProcessor.java 2009-09-14 22:20:05 UTC (rev 17= 568) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/JspContentAssistProcessor.java 2009-09-14 22:22:38 UTC (rev 17= 569) @@ -603,7 +603,14 @@ int cursorPosition =3D replacementString.length(); Image image =3D textProposal.getImage(); = - String displayString =3D prefix.getText().substring(0, replacementLeng= th) + textProposal.getReplacementString(); = + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> +// String displayString =3D prefix.getText().substring(0, replacementLe= ngth) + textProposal.getReplacementString(); + String displayString =3D textProposal.getLabel(); + if (displayString =3D=3D null) + displayString =3D textProposal.getReplacementString() =3D=3D null ? r= eplacementString : textProposal.getReplacementString(); + = + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes + IContextInformation contextInformation =3D null; String additionalProposalInfo =3D (textProposal.getContextInfo() =3D= =3D null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ int relevance =3D textProposal.getRelevance(); --===============0301279508221105043==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 18:23:24 2009 Content-Type: multipart/mixed; boundary="===============6336060154858347917==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17570 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el. Date: Mon, 14 Sep 2009 18:23:24 -0400 Message-ID: <200909142223.n8EMNO6P026601@svn01.web.mwc.hst.phx2.redhat.com> --===============6336060154858347917== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-14 18:23:24 -0400 (Mon, 14 Sep 2009) New Revision: 17570 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/el/AbstractELCompletionEngine.java Log: JBIDE-512 context variable code completion dropdown should show their "sour= ce" JBIDE-2541 Show java-doc for EL content assist item The values of type, sourceType and JavaDoc are gathered to be displayed in = CA Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/el/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-14 22:22:38 UTC (rev 17569) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-14 22:23:24 UTC (rev 17570) @@ -16,8 +16,11 @@ import java.util.TreeSet; = import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.Signature; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.swt.graphics.Image; @@ -40,6 +43,8 @@ import org.jboss.tools.common.el.core.resolver.ElVarSearcher; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.Var; +import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInf= o; +import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberPre= sentation; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.IPageContext; = @@ -248,18 +253,29 @@ ELOperandResolveStatus oldElStatus =3D resolveELOperand(file, operand, = returnEqualedVariablesOnly, false); status.getProposals().addAll(oldElStatus.getProposals()); } - + = + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> + // TODO: Add type, sourceType and JavaDoc found if possible + // Reason of incomplete: there are no resolved members here, = + // The var value is to be resolved by the ELResolver to let us know + // what is the var's type if(!returnEqualedVariablesOnly && vars!=3Dnull) { - List varNameProposals =3D getVarNameProposals(vars, operand.toS= tring()); - if (varNameProposals !=3D null) { - for (String varNameProposal : varNameProposals) { + = + for (Var v : vars) { + String prefix =3D operand.toString(); + if(v.getName().startsWith(prefix)) { + String varNameProposal =3D v.getName().substring(prefix.length()); TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(varNameProposal); + proposal.setLabel(v.getName()); proposal.setImage(getELProposalImage()); status.getProposals().add(proposal); } } } + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes + + return status; } = @@ -330,14 +346,39 @@ // no vars are resolved = // the tokens are the part of var name ended with a separator (.) resolvedVariables =3D resolveVariables(file, expr, true, returnEqualedV= ariablesOnly); = + Set proposals =3D new TreeSet(TextProposal.= KB_PROPOSAL_ORDER); for (V var : resolvedVariables) { String varName =3D var.getName(); if(varName.startsWith(operand.getText())) { + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> + MemberInfo member =3D getMemberInfoByVariable(var, true); + = + String sourceTypeName =3D member =3D=3D null ? null : member.getDecla= ringTypeQualifiedName(); + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + String typeName =3D member =3D=3D null ? null : member.getType().getN= ame(); + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + typeName =3D Signature.getSimpleName(typeName); + = + IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); + String attachedJavaDoc =3D null; + = + try { + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); + } catch (JavaModelException e) { + // Ignore + } + TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(varName.substring(operand.getLength())); setImage(proposal, var); + proposal.setType(typeName); + proposal.setSourceType(sourceTypeName); + proposal.setContextInfo(attachedJavaDoc); + = proposals.add(proposal); + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes } } status.setProposals(proposals); @@ -353,25 +394,53 @@ // For example @Factory and @DataModel. We should use @DataModel instea= d of @Factory // method which returns null. // See https://jira.jboss.org/jira/browse/JBIDE-3694 + = + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> TypeInfoCollector.MemberInfo bijectedAttribute =3D null; for (V var : resolvedVariables) { if(isSingularAttribute(var)) { bijectedAttribute =3D getMemberInfoByVariable(var, true); } + MemberInfo member =3D getMemberInfoByVariable(var, true); + String sourceTypeName =3D member =3D=3D null ? null : member.getDeclar= ingTypeQualifiedName(); + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + String typeName =3D member =3D=3D null ? null : member.getType().getNa= me(); + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + typeName =3D Signature.getSimpleName(typeName); + IJavaElement element =3D member =3D=3D null ? null : member.getJavaEle= ment(); + String attachedJavaDoc =3D null; + = + try { + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttachedJ= avadoc(null); + } catch (JavaModelException e) { + // Ignore + } + String varName =3D var.getName(); if(operand.getLength()<=3DvarName.length()) { TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(varName.substring(operand.getLength())); + proposal.setLabel(varName); setImage(proposal, var); + proposal.setType(typeName); + proposal.setSourceType(sourceTypeName); + proposal.setContextInfo(attachedJavaDoc); proposals.add(proposal); } else if(returnEqualedVariablesOnly) { TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(varName); + proposal.setLabel(varName); setImage(proposal, var); + proposal.setType(typeName); + proposal.setSourceType(sourceTypeName); + proposal.setContextInfo(attachedJavaDoc); proposals.add(proposal); } status.setMemberOfResolvedOperand(bijectedAttribute!=3Dnull?bijectedAt= tribute:getMemberInfoByVariable(var, true)); } + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes + status.setLastResolvedToken(expr); status.setProposals(proposals); return status; @@ -505,6 +574,9 @@ status.setMapOrCollectionOrBundleAmoungTheTokens(); } = + = + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> + /* Set methodPresentations =3D = infos.getMethodPresentationStrings(); if (methodPresentations !=3D null) { @@ -516,6 +588,43 @@ kbProposals.add(proposal); } } + */ + + Set methodPresentations =3D = + infos.getMethodPresentations(); + = + if (methodPresentations !=3D null) { + for (MemberPresentation presentation : methodPresentations) { + String presentationString =3D presentation.getPresentation(); + MemberInfo member =3D presentation.getMember(); + String sourceTypeName =3D member =3D=3D null ? null : member.getDecl= aringTypeQualifiedName(); + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + String typeName =3D member =3D=3D null ? null : member.getType().get= Name(); + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + typeName =3D Signature.getSimpleName(typeName); + IJavaElement element =3D member =3D=3D null ? null : member.getJavaE= lement(); + String attachedJavaDoc =3D null; + = + try { + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); + } catch (JavaModelException e) { + // Ignore + } + + TextProposal proposal =3D new TextProposal(); + proposal.setReplacementString(presentationString); + proposal.setLabel(presentationString); + proposal.setImage(getELProposalImage()); + proposal.setType(typeName); + proposal.setSourceType(sourceTypeName); + proposal.setContextInfo(attachedJavaDoc); + = + kbProposals.add(proposal); + } + } + + /* Set propertyPresentations =3D = infos.getPropertyPresentationStrings(status.getUnpairedGettersOrSette= rs()); if (propertyPresentations !=3D null) { @@ -527,6 +636,43 @@ kbProposals.add(proposal); } } + */ + + Set propertyPresentations =3D = + infos.getPropertyPresentations(status.getUnpairedGettersOrSetters()); + = + if (propertyPresentations !=3D null) { + for (MemberPresentation presentation : propertyPresentations) { + String presentationString =3D presentation.getPresentation(); + MemberInfo member =3D presentation.getMember(); + String sourceTypeName =3D member =3D=3D null ? null : member.getDecl= aringTypeQualifiedName(); + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + String typeName =3D member =3D=3D null ? null : member.getType().get= Name(); + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + typeName =3D Signature.getSimpleName(typeName); + IJavaElement element =3D member =3D=3D null ? null : member.getJavaE= lement(); + String attachedJavaDoc =3D null; + = + try { + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); + } catch (JavaModelException e) { + // Ignore + } + + TextProposal proposal =3D new TextProposal(); + proposal.setReplacementString(presentationString); + proposal.setLabel(presentationString); + proposal.setImage(getELProposalImage()); + proposal.setType(typeName); + proposal.setSourceType(sourceTypeName); + proposal.setContextInfo(attachedJavaDoc); + = + kbProposals.add(proposal); + } + } + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes + } } else if(expr.getType() !=3D ELObjectType.EL_ARGUMENT_INVOCATION) @@ -576,12 +722,35 @@ break; } } else if (proposal.getPresentation().startsWith(filter)) { + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> + // This is used for CA. + MemberInfo member =3D proposal.getMember(); + String sourceTypeName =3D member =3D=3D null ? null : member.getDecla= ringTypeQualifiedName(); + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + String typeName =3D member =3D=3D null ? null : member.getType().getN= ame(); + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + typeName =3D Signature.getSimpleName(typeName); + IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); + String attachedJavaDoc =3D null; + = + try { + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); + } catch (JavaModelException e) { + // Ignore + } + TextProposal kbProposal =3D new TextProposal(); kbProposal.setReplacementString(proposal.getPresentation().substring(= filter.length())); + kbProposal.setLabel(proposal.getPresentation()); kbProposal.setImage(getELProposalImage()); + kbProposal.setType(typeName); + kbProposal.setSourceType(sourceTypeName); + kbProposal.setContextInfo(attachedJavaDoc); = kbProposals.add(kbProposal); + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes } } } else if(expr.getType() =3D=3D ELObjectType.EL_ARGUMENT_INVOCATION) { @@ -645,6 +814,24 @@ } } else if (proposal.getPresentation().startsWith(filter)) { // This is used for CA. + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> + + MemberInfo member =3D proposal.getMember(); + String sourceTypeName =3D member =3D=3D null ? null : member.getDecla= ringTypeQualifiedName(); + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + String typeName =3D member =3D=3D null ? null : member.getType().getN= ame(); + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + typeName =3D Signature.getSimpleName(typeName); + IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); + String attachedJavaDoc =3D null; + = + try { + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); + } catch (JavaModelException e) { + // Ignore + } + TextProposal kbProposal =3D new TextProposal(); = String replacementString =3D proposal.getPresentation().substring(fil= ter.length()); @@ -654,8 +841,12 @@ = kbProposal.setReplacementString(replacementString); kbProposal.setImage(getELProposalImage()); - = + kbProposal.setType(typeName); + kbProposal.setSourceType(sourceTypeName); + kbProposal.setContextInfo(attachedJavaDoc); + = kbProposals.add(kbProposal); + // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes } } } --===============6336060154858347917==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 19:17:24 2009 Content-Type: multipart/mixed; boundary="===============8531372840857601003==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17571 - trunk/jmx. Date: Mon, 14 Sep 2009 19:17:24 -0400 Message-ID: <200909142317.n8ENHObm003014@svn01.web.mwc.hst.phx2.redhat.com> --===============8531372840857601003== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-14 19:17:23 -0400 (Mon, 14 Sep 2009) New Revision: 17571 Removed: trunk/jmx/.project Log: .project deleted from jmx component root folder to let import exixting proj= ect action to pick up all projects from jmx component Deleted: trunk/jmx/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/.project 2009-09-14 22:23:24 UTC (rev 17570) +++ trunk/jmx/.project 2009-09-14 23:17:23 UTC (rev 17571) @@ -1,11 +0,0 @@ - - - org.jboss.tools.jmx.releng - - - - - - - - --===============8531372840857601003==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 19:24:52 2009 Content-Type: multipart/mixed; boundary="===============0725803186085142508==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17572 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver. Date: Mon, 14 Sep 2009 19:24:52 -0400 Message-ID: <200909142324.n8ENOq2V004128@svn01.web.mwc.hst.phx2.redhat.com> --===============0725803186085142508== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-14 19:24:52 -0400 (Mon, 14 Sep 2009) New Revision: 17572 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolutionImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELSegmentImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberELSegmentImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/to= ols/common/el/core/resolver/ELResolutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java (rev= 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java 2009-09-14 23:24:52 UTC (rev= 17572) @@ -0,0 +1,88 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jdt.core.IJavaElement; +import org.jboss.tools.common.el.core.model.ELExpression; + +/** + * @author Alexey Kazakov + */ +public class ELResolutionImpl implements ELResolution { + + protected ELContext context; + protected List segments =3D new ArrayList(); + protected ELExpression operand; + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentB= yJavaElement(org.eclipse.jdt.core.IJavaElement) + */ + public ELSegment findSegmentByJavaElement(IJavaElement element) { + // TODO + return null; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentB= yOffset(int) + */ + public ELSegment findSegmentByOffset(int offcet) { + // TODO + return null; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#getContext() + */ + public ELContext getContext() { + return context; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#getSegments() + */ + public List getSegments() { + return segments; + } + + /** + * Adds a segment + * @param segment + */ + public void addSegment(ELSegment segment) { + segments.add(segment); + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#getSourceOpe= rand() + */ + public ELExpression getSourceOperand() { + return operand; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#getUnresolve= dSegment() + */ + public ELSegment getUnresolvedSegment() { + // TODO + return null; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#hasUnresolve= dSegment() + */ + public boolean hasUnresolvedSegment() { + // TODO + return false; + } +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/sr= c/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/to= ols/common/el/core/resolver/ELSegmentImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegmentImpl.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegmentImpl.java 2009-09-14 23:24:52 UTC (rev 17= 572) @@ -0,0 +1,82 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.model.project.ext.ITextSourceReference; + +/** + * @author Alexey Kazakov + */ +public class ELSegmentImpl implements ELSegment { + + protected IResource resource; + protected ITextSourceReference sourceReference; + protected ELInvocationExpression token; + protected boolean resolved =3D false; + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELSegment#getResource() + */ + public IResource getResource() { + return resource; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELSegment#getSourceRefere= nce() + */ + public ITextSourceReference getSourceReference() { + return sourceReference; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELSegment#getToken() + */ + public ELInvocationExpression getToken() { + return token; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELSegment#isResolved() + */ + public boolean isResolved() { + return resolved; + } + + /** + * @param resource the resource to set + */ + public void setResource(IResource resource) { + this.resource =3D resource; + } + + /** + * @param sourceReference the sourceReference to set + */ + public void setSourceReference(ITextSourceReference sourceReference) { + this.sourceReference =3D sourceReference; + } + + /** + * @param token the token to set + */ + public void setToken(ELInvocationExpression token) { + this.token =3D token; + } + + /** + * @param resolved the resolved to set + */ + public void setResolved(boolean resolved) { + this.resolved =3D resolved; + } +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/sr= c/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/to= ols/common/el/core/resolver/JavaMemberELSegmentImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegmentImpl.java = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegmentImpl.java 2009-09-14 23:24:52 U= TC (rev 17572) @@ -0,0 +1,102 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +import org.eclipse.jdt.core.IJavaElement; +import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInf= o; + +/** + * @author Alexey Kazakov + */ +public class JavaMemberELSegmentImpl extends ELSegmentImpl implements Java= MemberElSegment { + + protected IJavaElement element; + protected MemberInfo memberInfo; + protected boolean hasSetter; + protected boolean hasGetter; + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.JavaMemberElSegment#getJa= vaElement() + */ + public IJavaElement getJavaElement() { + return element; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.JavaMemberElSegment#getMe= mberInfo() + */ + public MemberInfo getMemberInfo() { + return memberInfo; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.JavaMemberElSegment#hasGe= tter() + */ + public boolean hasGetter() { + return hasGetter; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.JavaMemberElSegment#hasSe= tter() + */ + public boolean hasSetter() { + return hasSetter; + } + + /** + * @return the element + */ + public IJavaElement getElement() { + return element; + } + + /** + * @param element the element to set + */ + public void setElement(IJavaElement element) { + this.element =3D element; + } + + /** + * @return the hasSetter + */ + public boolean isHasSetter() { + return hasSetter; + } + + /** + * @param hasSetter the hasSetter to set + */ + public void setHasSetter(boolean hasSetter) { + this.hasSetter =3D hasSetter; + } + + /** + * @return the hasGetter + */ + public boolean isHasGetter() { + return hasGetter; + } + + /** + * @param hasGetter the hasGetter to set + */ + public void setHasGetter(boolean hasGetter) { + this.hasGetter =3D hasGetter; + } + + /** + * @param memberInfo the memberInfo to set + */ + public void setMemberInfo(MemberInfo memberInfo) { + this.memberInfo =3D memberInfo; + } +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/sr= c/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============0725803186085142508==-- From jbosstools-commits at lists.jboss.org Mon Sep 14 19:25:09 2009 Content-Type: multipart/mixed; boundary="===============3841224249980897214==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17573 - trunk/maven/features/org.jboss.tools.maven.sdk.feature. Date: Mon, 14 Sep 2009 19:25:09 -0400 Message-ID: <200909142325.n8ENP9xN004272@svn01.web.mwc.hst.phx2.redhat.com> --===============3841224249980897214== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-14 19:25:09 -0400 (Mon, 14 Sep 2009) New Revision: 17573 Modified: trunk/maven/features/org.jboss.tools.maven.sdk.feature/.project Log: renaming maven sdk feature to maven.sdk.feature instead of maven.feature Modified: trunk/maven/features/org.jboss.tools.maven.sdk.feature/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/features/org.jboss.tools.maven.sdk.feature/.project 2009-09= -14 23:24:52 UTC (rev 17572) +++ trunk/maven/features/org.jboss.tools.maven.sdk.feature/.project 2009-09= -14 23:25:09 UTC (rev 17573) @@ -1,6 +1,6 @@ - org.jboss.tools.maven.feature + org.jboss.tools.maven.sdk.feature --===============3841224249980897214==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 03:07:13 2009 Content-Type: multipart/mixed; boundary="===============1839910647209567693==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17574 - in trunk/documentation/whatsnew: smooks and 1 other directory. Date: Tue, 15 Sep 2009 03:07:13 -0400 Message-ID: <200909150707.n8F77DTt028284@svn01.web.mwc.hst.phx2.redhat.com> --===============1839910647209567693== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: DartPeng Date: 2009-09-15 03:07:12 -0400 (Tue, 15 Sep 2009) New Revision: 17574 Added: trunk/documentation/whatsnew/images/smookstools_addchildren_wizardpage.p= ng trunk/documentation/whatsnew/images/smookstools_addreader_wizardpage.png trunk/documentation/whatsnew/images/smookstools_csvdatawizard3.png trunk/documentation/whatsnew/images/smookstools_edi_config_wizardpage.png trunk/documentation/whatsnew/images/smookstools_edi_message_mapping_edit= or.png trunk/documentation/whatsnew/images/smookstools_edi_message_mapping_file= _wizard.png trunk/documentation/whatsnew/images/smookstools_edi_wizard_v12.png trunk/documentation/whatsnew/images/smookstools_inputdataselection_v12.p= ng trunk/documentation/whatsnew/images/smookstools_jsondatawizard3.png trunk/documentation/whatsnew/images/smookstools_message_filter_page.png trunk/documentation/whatsnew/images/smookstools_overview_page.png trunk/documentation/whatsnew/images/smookstools_reader_page.png trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M3.html Log: Add files and images for Smooks what-news Added: trunk/documentation/whatsnew/images/smookstools_addchildren_wizardpa= ge.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_addchi= ldren_wizardpage.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_addreader_wizardpage= .png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_addrea= der_wizardpage.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_csvdatawizard3.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_csvdat= awizard3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_edi_config_wizardpag= e.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_edi_co= nfig_wizardpage.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_edi_message_mapping_= editor.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_edi_me= ssage_mapping_editor.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_edi_message_mapping_= file_wizard.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_edi_me= ssage_mapping_file_wizard.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_edi_wizard_v12.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_edi_wi= zard_v12.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_inputdataselection_v= 12.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_inputd= ataselection_v12.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_jsondatawizard3.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_jsonda= tawizard3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_message_filter_page.= png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_messag= e_filter_page.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_overview_page.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_overvi= ew_page.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/smookstools_reader_page.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/smookstools_reader= _page.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M3.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M3.html = (rev 0) +++ trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M3.html 2009-09-1= 5 07:07:12 UTC (rev 17574) @@ -0,0 +1,135 @@ + + + + + + + +Smooks tools 1.1.0.M3 What's New + + +

Smooks tools 1.1.0.M3 What's New

+ +

< Main Index Hibernate >

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + Smooks Configuration Editor + +
Multiple Page Editor	+ Overview page. Configurate the high level informations of + Smooks configuration file. + + + + Reader Page. Add/Remove the Reader model in this page. + + + + Message Filter Page. This page inherits many functions from the + Design page , it can add/remove the message filter resources. + + +
+ +
Support + the Smooks configuration file 1.2.1 version	+ The Smooks editor support the Smooks configuration file which + is related to Smooks 1.2.1 platform. + + + + + +
+ +
Support + CSV,JSON,EDI input type data	+ Support CSV , JSON , EDI input type data + + + + CSV input Reader configuration wizard page. + + + + EDI input Reader configuration wizard page. + + + + JSON input Reader configuration wizard page. + + + +
+ + EDI Message Mapping Graphical Editor + +
EDI + Message Mapping Graphical Editor	+ EDI Message Mapping File Wizard. + + + + + + EDI Message Mapping Graphical Editor. It can edit the + EDI-Message-Mapping configuration file. + + <= /p> + +
+ +

+ + + + + + Property changes on: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.= M3.html ___________________________________________________________________ Name: svn:mime-type + text/plain --===============1839910647209567693==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 03:22:09 2009 Content-Type: multipart/mixed; boundary="===============8158836364443153914==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17575 - trunk/tests/features/org.jboss.tools.all.test.feature. Date: Tue, 15 Sep 2009 03:22:09 -0400 Message-ID: <200909150722.n8F7M9eb031348@svn01.web.mwc.hst.phx2.redhat.com> --===============8158836364443153914== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 03:22:09 -0400 (Tue, 15 Sep 2009) New Revision: 17575 Modified: trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml Log: css.tests were included to the all.test feature Modified: trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-= 09-15 07:07:12 UTC (rev 17574) +++ trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-= 09-15 07:22:09 UTC (rev 17575) @@ -1,232 +1,246 @@ - - - - - [Enter Feature Description here.] - - - - [Enter Copyright Description here.] - - - Red Hat, Inc. licenses these features and plugins to you under -certain open source licenses (or aggregations of such licenses), which -in a particular case may include the Eclipse Public License, the GNU -Lesser General Public License, and/or certain other open source -licenses. For precise licensing details, consult the corresponding -source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, -Raleigh NC 27606 USA. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + Red Hat, Inc. licenses these features and plugins to you under +certain open source licenses (or aggregations of such licenses), which +in a particular case may include the Eclipse Public License, the GNU +Lesser General Public License, and/or certain other open source +licenses. For precise licensing details, consult the corresponding +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, +Raleigh NC 27606 USA. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --===============8158836364443153914==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 03:26:26 2009 Content-Type: multipart/mixed; boundary="===============6137889577567552106==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17576 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources: JBIDE3247/.settings and 10 other directories. Date: Tue, 15 Sep 2009 03:26:26 -0400 Message-ID: <200909150726.n8F7QQEr032093@svn01.web.mwc.hst.phx2.redhat.com> --===============6137889577567552106== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 03:26:25 -0400 (Tue, 15 Sep 2009) New Revision: 17576 Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.se= ttings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.se= ttings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.se= ttings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/common-annotations.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/commons-beanutils.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/commons-collections.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/commons-digester.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/commons-logging.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/jstl.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacelet= sTestProject/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacelet= sTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacelet= sTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacelet= sTestProject/WebContent/WEB-INF/classes/demo/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacelet= sTestProject/ant/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebC= ontent/WEB-INF/lib/jsf-api.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/JavaS= ource/demo/User.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/classes/demo/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/common-annotations.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/commons-beanutils.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/commons-collections.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/commons-digester.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/commons-logging.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/jstl.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/ant/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.cl= asspath trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.pr= oject trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/jsf-facelets.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/standard.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacelet= sTestProject/.project trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebC= ontent/WEB-INF/lib/jsf-impl.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/jboss-seam-ui.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/richfaces-ui-3.1.6.SR1.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/WEB-INF/lib/standard.jar Log: surplus resources were deleted from jsf.vpe.jsf tests test projects: 1. jars that doesn't contain tlds 2. unused resources like ant scripts 3. validation and verification builders were removed 4. jstd feature settings and feature were removed surplus resources are not needed to pass those tests Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3= 247/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.c= lasspath 2009-09-15 07:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.c= lasspath 2009-09-15 07:26:25 UTC (rev 17576) @@ -4,6 +4,6 @@ - + Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3= 247/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.p= roject 2009-09-15 07:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.p= roject 2009-09-15 07:26:25 UTC (rev 17576) @@ -6,11 +6,6 @@ - org.eclipse.wst.jsdt.core.javascriptValidator - - - - org.eclipse.wst.common.project.facet.core.builder @@ -20,16 +15,6 @@ - - org.eclipse.wst.validation.validationbuilder - - - - - org.jboss.tools.common.verification.verifybuilder - - - org.eclipse.jem.workbench.JavaEMFNature @@ -37,6 +22,5 @@ org.eclipse.wst.common.modulecore.ModuleCoreNature org.jboss.tools.jsf.jsfnature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/.settings/.jsdtscope =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.s= ettings/.jsdtscope 2009-09-15 07:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.s= ettings/.jsdtscope 2009-09-15 07:26:25 UTC (rev 17576) @@ -1,11 +0,0 @@ - - - - - - - - - - - Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/.settings/org.eclipse.wst.jsdt.ui.superType.container =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.s= ettings/org.eclipse.wst.jsdt.ui.superType.container 2009-09-15 07:22:09 UTC= (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.s= ettings/org.eclipse.wst.jsdt.ui.superType.container 2009-09-15 07:26:25 UTC= (rev 17576) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/.settings/org.eclipse.wst.jsdt.ui.superType.name =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.s= ettings/org.eclipse.wst.jsdt.ui.superType.name 2009-09-15 07:22:09 UTC (rev= 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/.s= ettings/org.eclipse.wst.jsdt.ui.superType.name 2009-09-15 07:26:25 UTC (rev= 17576) @@ -1 +0,0 @@ -Window \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/WebContent/WEB-INF/lib/common-annotations.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/WebContent/WEB-INF/lib/commons-beanutils.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/WebContent/WEB-INF/lib/commons-collections.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/WebContent/WEB-INF/lib/commons-digester.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/WebContent/WEB-INF/lib/commons-logging.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3= 247/WebContent/WEB-INF/lib/jsf-facelets.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE32= 47/WebContent/WEB-INF/lib/jstl.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3= 247/WebContent/WEB-INF/lib/standard.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/custom= FaceletsTestProject/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.project 2009-09-15 07:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.project 2009-09-15 07:26:25 UTC (rev 17576) @@ -6,11 +6,6 @@ - org.eclipse.wst.jsdt.core.javascriptValidator - - - - org.eclipse.wst.common.project.facet.core.builder @@ -20,16 +15,6 @@ - - org.eclipse.wst.validation.validationbuilder - - - - - org.jboss.tools.common.verification.verifybuilder - - - org.eclipse.jem.workbench.JavaEMFNature @@ -37,6 +22,5 @@ org.eclipse.wst.common.modulecore.ModuleCoreNature org.jboss.tools.jsf.jsfnature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customF= aceletsTestProject/.settings/.jsdtscope =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.settings/.jsdtscope 2009-09-15 07:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.settings/.jsdtscope 2009-09-15 07:26:25 UTC (rev 17576) @@ -1,11 +0,0 @@ - - - - - - - - - - - Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customF= aceletsTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-09= -15 07:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-09= -15 07:26:25 UTC (rev 17576) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customF= aceletsTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-09-15 0= 7:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFacele= tsTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-09-15 0= 7:26:25 UTC (rev 17576) @@ -1 +0,0 @@ -Window \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2tes= t/WebContent/WEB-INF/lib/jsf-api.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2te= st/WebContent/WEB-INF/lib/jsf-impl.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /JavaSource/demo/User.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/Java= Source/demo/User.java 2009-09-15 07:22:09 UTC (rev 17575) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/Java= Source/demo/User.java 2009-09-15 07:26:25 UTC (rev 17576) @@ -1,33 +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 demo; - -/** - * Created by JBoss Developer Studio - */ -public class User { - - private String name; - - /** - * @return User Name - */ - public String getName() { - return name; - } - - /** - * @param User Name - */ - public void setName(String name) { - this.name =3D name; - } -} \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /WebContent/WEB-INF/lib/common-annotations.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /WebContent/WEB-INF/lib/commons-beanutils.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /WebContent/WEB-INF/lib/commons-collections.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /WebContent/WEB-INF/lib/commons-digester.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /WebContent/WEB-INF/lib/commons-logging.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTes= t/WebContent/WEB-INF/lib/jboss-seam-ui.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /WebContent/WEB-INF/lib/jstl.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTes= t/WebContent/WEB-INF/lib/richfaces-ui-3.1.6.SR1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTes= t/WebContent/WEB-INF/lib/standard.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============6137889577567552106==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:12:59 2009 Content-Type: multipart/mixed; boundary="===============8685647879557091375==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17577 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/texteditors/preferences and 1 other directory. Date: Tue, 15 Sep 2009 08:12:58 -0400 Message-ID: <200909151212.n8FCCwKA024557@svn01.web.mwc.hst.phx2.redhat.com> --===============8685647879557091375== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:12:58 -0400 (Tue, 15 Sep 2009) New Revision: 17577 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/editor/ObjectMultiPageEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/editor/OpenEditorWizard.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/texteditors/preferences/EditorsPreferencesPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/editor/ObjectMultiPageEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/ObjectMultiPageEditor.java 2009-09-15 07:26:25 UTC (rev 175= 76) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/ObjectMultiPageEditor.java 2009-09-15 12:12:58 UTC (rev 175= 77) @@ -491,8 +491,23 @@ = boolean lock2 =3D false; = + boolean waitForMerge =3D false; + int waitingEventsCount =3D 0; + = public void nodeChanged(XModelTreeEvent event) { if(lock2) return; + if(event.getDetails() =3D=3D XModelTreeEvent.BEFORE_MERGE && event.getMo= delObject() =3D=3D getModelObject()) { + waitForMerge =3D true; + waitingEventsCount =3D 0; + return; + } + if(event.getDetails() =3D=3D XModelTreeEvent.AFTER_MERGE && event.getMod= elObject() =3D=3D getModelObject()) { + waitForMerge =3D false; + System.out.println("waitingEventsCount=3D" + waitingEventsCount); + waitingEventsCount =3D 0; + } + waitingEventsCount++; + if(waitForMerge) return; if(needsUpdate()) { Display.getDefault().syncExec(new U()); } @@ -500,6 +515,8 @@ = public void structureChanged(XModelTreeEvent event) { if(lock2) return; + waitingEventsCount++; + if(waitForMerge) return; if(needsUpdate()) { Display.getDefault().syncExec(new U()); } @@ -1238,140 +1255,5 @@ return false; } = - private void showWarning() throws XModelException { - boolean isShowingWarning =3D "yes".equals(Preference.SHOW_NATURE_WARNING= .getValue()); //$NON-NLS-1$ - if(!isShowingWarning) return; - ServiceDialog d =3D PreferenceModelUtilities.getPreferenceModel().getSer= vice(); - Properties p =3D new Properties(); - String[] natures =3D this.natures; - if(natures =3D=3D null) natures =3D NatureOptionList.getAllNatures(); - NatureOption[] options =3D new NatureOption[natures.length]; - for (int i =3D 0; i < options.length; i++) { - String[] ds =3D NatureOptionList.getNatureDescription(natures[i]); - if(ds =3D=3D null) continue; - options[i] =3D new NatureOption(ds[1], ds[2]); - options[i].setActionClass(ds[3]); - options[i].setResource(resource); - } - String message =3D WizardKeys.getString(warningKey); - p.setProperty(ServiceDialog.DIALOG_MESSAGE, message); - String box =3D WizardKeys.getString("SharableEditors.natureWarning.box.m= essage"); //$NON-NLS-1$ - Option showOption =3D new Option(box); - int k =3D 0; - for (int i =3D 0; i < options.length; i++) { - if(options[i] !=3D null && options[i].register(p, k)) ++k; - } - = - if(showOption.register(p, k)) { - p.setProperty(ServiceDialog.SEPARATOR + "_" + k, "true"); //$NON-NLS-1$= //$NON-NLS-2$ - ++k; - } - - p.setProperty("title", "Warning"); //$NON-NLS-1$ - p.put(ServiceDialog.BUTTONS, new String[]{"OK"}); - d.openConfirm(p); - for (int i =3D 0; i < options.length; i++) { - if(options[i] !=3D null && options[i].isSelected(p)) { - options[i].run(); - if(input instanceof IFileEditorInput) { - input =3D XModelObjectEditorInput.checkInput(new FileEditorInput(((IF= ileEditorInput)input).getFile())); - } - } - } - if(showOption.isSelected(p)) { - showOption.run(); - } - } - = } = -class Option extends ServiceDialogOption { - = - public Option(String text) { - super(text); - } - = - public void run() throws XModelException { - Preference.SHOW_NATURE_WARNING.setValue("no"); //$NON-NLS-1$ - } -} - -class NatureOptionList { - //use extension point to avoid hardcode = - static String[][] natureOptionDescriptions =3D new String[][]{ - {"org.jboss.tools.jsf.jsfnature", //$NON-NLS-1$ - "JSF", = - "org.jboss.tools.jsf.ui", //$NON-NLS-1$ - "org.jboss.tools.jsf.ui.action.AddJSFNatureActionDelegate"}, //$NON-NLS= -1$ - {"org.jboss.tools.struts.strutsnature", //$NON-NLS-1$ - "Struts", - "org.jboss.tools.struts.ui", //$NON-NLS-1$ - "org.jboss.tools.struts.ui.internal.action.AddStrutsNatureActionDelegat= e" //$NON-NLS-1$ - }, - }; - static Map natureOptionDescriptionsMap =3D new HashMap(); - = - static { - for (int i =3D 0; i < natureOptionDescriptions.length; i++) { - natureOptionDescriptionsMap.put(natureOptionDescriptions[i][0], natureO= ptionDescriptions[i]); - } - } - = - public static String[] getAllNatures() { - String[] ns =3D new String[natureOptionDescriptions.length]; - for (int i =3D 0; i < ns.length; i++) ns[i] =3D natureOptionDescriptions= [i][0]; - return ns; - } - = - public static String[] getNatureDescription(String nature) { - return (String[])natureOptionDescriptionsMap.get(nature); - } -} - -class NatureOption extends ServiceDialogOption { - String plugin; - String actionClass; - IResource resource =3D null; - = - public NatureOption(String name, String plugin) { - super(MessageFormat.format("Add {0} Capabilities now", name)); - this.plugin =3D plugin; - } - = - public void setActionClass(String actionClass) { - this.actionClass =3D actionClass; - } - = - public void setResource(IResource resource) { - this.resource =3D resource; - } - = - public boolean register(Properties p, int k) { - if(Platform.getBundle(plugin) =3D=3D null) { - property =3D null; - return false; - } - return super.register(p, k); - } - - public void run() throws XModelException { - Bundle bundle =3D Platform.getBundle(plugin); - if(bundle =3D=3D null) return; - IActionDelegate delegate =3D null; - try { - delegate =3D (IActionDelegate)bundle.loadClass(actionClass).newInstance= (); - } catch (ClassNotFoundException e) { - //ignore - } catch (InstantiationException e) { - //ignore - } catch (IllegalAccessException e) { - //ignore - } - if(delegate =3D=3D null) return; - delegate.selectionChanged(null, new StructuredSelection(resource)); - delegate.run(null); - } - -} - - Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/editor/OpenEditorWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/OpenEditorWizard.java 2009-09-15 07:26:25 UTC (rev 17576) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/OpenEditorWizard.java 2009-09-15 12:12:58 UTC (rev 17577) @@ -18,6 +18,7 @@ import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; @@ -42,7 +43,7 @@ if(id !=3D null && (id.length() =3D=3D 0 || id.equals("DefaultEditor"))= ) { //$NON-NLS-1$ id =3D null; } else { - boolean b =3D "yes".equals(PreferenceModelUtilities.getPreferenceModel= ().getByPath("%Options%/Struts Studio/Editors").getAttributeValue("useRedHa= tEditors")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + boolean b =3D "yes".equals(PreferenceModelUtilities.getPreferenceModel= ().getByPath(Preference.EDITOR_PATH).getAttributeValue("useRedHatEditors"))= ; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if(!b) id =3D null; } IModelObjectEditorInput input =3D XModelObjectEditorInput.createInstanc= e(object); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/texteditors/preferences/EditorsPreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/texteditors/preferences/EditorsPreferencesPage.java 2009-= 09-15 07:26:25 UTC (rev 17576) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/texteditors/preferences/EditorsPreferencesPage.java 2009-= 09-15 12:12:58 UTC (rev 17577) @@ -13,6 +13,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.eclipse.core.runtime.Platform; +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.preferences.XMOBasedPreferencesPage; import org.jboss.tools.common.model.ui.util.ModelUtilities; @@ -25,7 +26,7 @@ = public static final String EDITOR_PREFERENCES_ID =3D "org.jboss.tools.com= mon.xstudio.editors"; //$NON-NLS-1$ = - static String PATH =3D "%Options%/Struts Studio/Editors"; //$NON-NLS-1$ + static String PATH =3D Preference.EDITOR_PATH; = public EditorsPreferencesPage() { super(_getPreferenceModel().getByPath(PATH)); --===============8685647879557091375==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:14:21 2009 Content-Type: multipart/mixed; boundary="===============1813972395611012940==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17578 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences. Date: Tue, 15 Sep 2009 08:14:21 -0400 Message-ID: <200909151214.n8FCELpL024714@svn01.web.mwc.hst.phx2.redhat.com> --===============1813972395611012940== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:14:21 -0400 (Tue, 15 Sep 2009) New Revision: 17578 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/pr= eferences/VpePreference.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/preferences/VpePreference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/VpePreference.java 2009-09-15 12:12:58 UTC (rev 17577) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/VpePreference.java 2009-09-15 12:14:21 UTC (rev 17578) @@ -27,7 +27,7 @@ public static String ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT=3D"alway= s hide selection bar without prompt"; //$NON-NLS-1$ public static String ATT_SHOW_INVISIBLE_TAGS=3D"show non-visual tags"; //= $NON-NLS-1$ public static String SHOW_COMMENTS_VALUE; - public static String VPE_EDITOR_PATH =3D "%Options%/Struts Studio/Editors= /Visual Page Editor"; //$NON-NLS-1$ + public static String VPE_EDITOR_PATH =3D Preference.EDITOR_PATH + "/Visua= l Page Editor"; //$NON-NLS-1$ public static final Preference SHOW_COMMENTS =3D new VpePreference(VPE_ED= ITOR_PATH, ATT_SHOW_COMMENTS); public static final Preference SHOW_BORDER_FOR_UNKNOWN_TAGS =3D new VpePr= eference(VPE_EDITOR_PATH, ATT_SHOW_BORDER_FOR_UNKNOWN_TAGS); public static final Preference SHOW_BORDER_FOR_ALL_TAGS =3D new VpePrefer= ence(VPE_EDITOR_PATH, ATT_SHOW_BORDER_FOR_ALL_TAGS); --===============1813972395611012940==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:14:54 2009 Content-Type: multipart/mixed; boundary="===============5598275568298728954==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17579 - trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences. Date: Tue, 15 Sep 2009 08:14:54 -0400 Message-ID: <200909151214.n8FCEsSe024786@svn01.web.mwc.hst.phx2.redhat.com> --===============5598275568298728954== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:14:54 -0400 (Tue, 15 Sep 2009) New Revision: 17579 Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/strut= s/ui/preferences/WebFlowTabbedPreferencesPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tool= s/struts/ui/preferences/WebFlowTabbedPreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/stru= ts/ui/preferences/WebFlowTabbedPreferencesPage.java 2009-09-15 12:14:21 UTC= (rev 17578) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/stru= ts/ui/preferences/WebFlowTabbedPreferencesPage.java 2009-09-15 12:14:54 UTC= (rev 17579) @@ -10,6 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.ui.preferences; = +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.model.ui.preferences.*; import org.eclipse.ui.*; import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintALi= st; @@ -18,7 +19,7 @@ import org.jboss.tools.struts.ui.StrutsUIPlugin; = public class WebFlowTabbedPreferencesPage extends TabbedPreferencesPage im= plements IWorkbenchPreferencePage { - public static String STRUTS_EDITOR_PATH =3D "%Options%/Struts Studio/Edit= ors/Web Flow Diagram"; + public static String STRUTS_EDITOR_PATH =3D Preference.EDITOR_PATH + "/We= b Flow Diagram"; public static String ADD_PAGE_PATH =3D StrutsPreference.ADD_PAGE_PATH; = public WebFlowTabbedPreferencesPage() { --===============5598275568298728954==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:18:31 2009 Content-Type: multipart/mixed; boundary="===============1883751629796437031==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17580 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles. Date: Tue, 15 Sep 2009 08:18:30 -0400 Message-ID: <200909151218.n8FCIUmD025483@svn01.web.mwc.hst.phx2.redhat.com> --===============1883751629796437031== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:18:30 -0400 (Tue, 15 Sep 2009) New Revision: 17580 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/= web/tiles/TilesPreference.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/too= ls/jst/web/tiles/TilesPreference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst= /web/tiles/TilesPreference.java 2009-09-15 12:14:54 UTC (rev 17579) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst= /web/tiles/TilesPreference.java 2009-09-15 12:18:30 UTC (rev 17580) @@ -15,7 +15,7 @@ = public class TilesPreference extends WebPreference { = - public static final String TILES_DIAGRAM_PATH =3D "%Options%/Struts Stu= dio/Editors/Tiles Diagram"; //$NON-NLS-1$ + public static final String TILES_DIAGRAM_PATH =3D Preference.EDITOR_PAT= H + "/Tiles Diagram"; //$NON-NLS-1$ public static final Preference VERTICAL_SPACING =3D new TilesPreference(T= ILES_DIAGRAM_PATH, "verticalSpacing"); //$NON-NLS-1$ public static final Preference HORIZONTAL_SPACING =3D new TilesPreference= (TILES_DIAGRAM_PATH, "horizontalSpacing"); //$NON-NLS-1$ public static final Preference TILES_ALIGNMENT =3D new TilesPreference(TI= LES_DIAGRAM_PATH, "alignment"); //$NON-NLS-1$ --===============1883751629796437031==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:20:33 2009 Content-Type: multipart/mixed; boundary="===============2874428622973959463==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17581 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/preferences. Date: Tue, 15 Sep 2009 08:20:28 -0400 Message-ID: <200909151220.n8FCKS4T025970@svn01.web.mwc.hst.phx2.redhat.com> --===============2874428622973959463== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:20:28 -0400 (Tue, 15 Sep 2009) New Revision: 17581 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/j= st/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/= tools/jst/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/= jst/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java 2009-09-= 15 12:18:30 UTC (rev 17580) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/= jst/web/tiles/ui/preferences/TilesEditorTabbedPreferencesPage.java 2009-09-= 15 12:20:28 UTC (rev 17581) @@ -17,10 +17,11 @@ = import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.model.plugin.ModelPlugin; = public class TilesEditorTabbedPreferencesPage extends TabbedPreferencesPag= e implements IWorkbenchPreferencePage { - public static String TILES_EDITOR_PATH =3D "%Options%/Struts Studio/Edito= rs/Tiles Diagram"; //$NON-NLS-1$ + public static String TILES_EDITOR_PATH =3D Preference.EDITOR_PATH + "/Til= es Diagram"; //$NON-NLS-1$ = public TilesEditorTabbedPreferencesPage() { XModel model =3D getPreferenceModel(); = --===============2874428622973959463==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:24:57 2009 Content-Type: multipart/mixed; boundary="===============2573000272563719456==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17582 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts. Date: Tue, 15 Sep 2009 08:24:57 -0400 Message-ID: <200909151224.n8FCOvvW026475@svn01.web.mwc.hst.phx2.redhat.com> --===============2573000272563719456== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:24:57 -0400 (Tue, 15 Sep 2009) New Revision: 17582 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/S= trutsPreference.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/s= truts/StrutsPreference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/= StrutsPreference.java 2009-09-15 12:20:28 UTC (rev 17581) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/= StrutsPreference.java 2009-09-15 12:24:57 UTC (rev 17582) @@ -30,7 +30,7 @@ = public static final Preference DEFAULT_STRUTS_IMPORT_SERVLET_VERSION =3D= new StrutsPreference(OPTIONS_IMPORT_PROJECT_PATH, "Servlet Version"); //$N= ON-NLS-1$ = - public static final String WEB_FLOW_DIAGRAM_PATH =3D "%Options%/Struts = Studio/Editors/Web Flow Diagram"; //$NON-NLS-1$ + public static final String WEB_FLOW_DIAGRAM_PATH =3D Preference.EDITOR_= PATH + "/Web Flow Diagram"; //$NON-NLS-1$ public static final Preference REMOVE_PAGE_AND_FILE =3D new StrutsPrefere= nce(WEB_FLOW_DIAGRAM_PATH, "removePageWithFile"); //$NON-NLS-1$ public static final Preference DO_NOT_SHOW_DIAGRAM =3D new StrutsPreferen= ce(WEB_FLOW_DIAGRAM_PATH, "doNotShowDiagram"); //$NON-NLS-1$ public static final Preference ENABLE_CONTROL_MODE_ON_TRANSITION_COMPLETE= D =3D new StrutsPreference(WEB_FLOW_DIAGRAM_PATH, "enableControlModeOnTrans= itionCompleted"); //$NON-NLS-1$ --===============2573000272563719456==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:25:40 2009 Content-Type: multipart/mixed; boundary="===============0387664578869143684==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17583 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor. Date: Tue, 15 Sep 2009 08:25:39 -0400 Message-ID: <200909151225.n8FCPd9f026837@svn01.web.mwc.hst.phx2.redhat.com> --===============0387664578869143684== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:25:39 -0400 (Tue, 15 Sep 2009) New Revision: 17583 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/editor/ObjectMultiPageEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/editor/ObjectMultiPageEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/ObjectMultiPageEditor.java 2009-09-15 12:24:57 UTC (rev 175= 82) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/ObjectMultiPageEditor.java 2009-09-15 12:25:39 UTC (rev 175= 83) @@ -146,7 +146,7 @@ private void loadSelectedTab() { IFile file =3D getFile(); try { - if("yes".equals(PreferenceModelUtilities.getPreferenceModel().getByPath= ("%Options%/Struts Studio/Editors").getAttributeValue("selectSourceTab"))) = { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if("yes".equals(PreferenceModelUtilities.getPreferenceModel().getByPath= (Preference.EDITOR_PATH).getAttributeValue("selectSourceTab"))) { //$NON-NL= S-1$ //$NON-NLS-2$ //$NON-NLS-3$ selectedPageIndex =3D getSourcePageIndex(); } else if(file =3D=3D null) { loadSelectedTabForStorage(); --===============0387664578869143684==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:26:35 2009 Content-Type: multipart/mixed; boundary="===============3629005187539499331==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17584 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf. Date: Tue, 15 Sep 2009 08:26:35 -0400 Message-ID: <200909151226.n8FCQZkb026965@svn01.web.mwc.hst.phx2.redhat.com> --===============3629005187539499331== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:26:34 -0400 (Tue, 15 Sep 2009) New Revision: 17584 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPrefere= nce.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSF= Preference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPrefer= ence.java 2009-09-15 12:25:39 UTC (rev 17583) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPrefer= ence.java 2009-09-15 12:26:34 UTC (rev 17584) @@ -18,7 +18,7 @@ public static final String OPTIONS_JSF_PROJECT_PATH =3D OPTIONS_JSFSTUDIO= _PATH + "/Project"; //$NON-NLS-1$ public static final String OPTIONS_JSF_NEW_PROJECT_PATH =3D OPTIONS_JSF_P= ROJECT_PATH + "/New Project"; //$NON-NLS-1$ public static final String OPTIONS_JSF_IMPORT_PROJECT_PATH =3D OPTIONS_JS= F_PROJECT_PATH + "/Import Project"; //$NON-NLS-1$ - public static String JSF_EDITOR_PATH =3D "%Options%/Struts Studio/Editors= /JSF Flow Diagram"; //$NON-NLS-1$ + public static String JSF_EDITOR_PATH =3D Preference.EDITOR_PATH + "/JSF F= low Diagram"; //$NON-NLS-1$ public static String JSF_ADD_VIEW_PATH =3D JSF_EDITOR_PATH + "/Add View";= //$NON-NLS-1$ = public static final Preference USE_DEFAULT_JSF_PROJECT_ROOT =3D new JSFPr= eference(OPTIONS_JSF_NEW_PROJECT_PATH, "Use Default Path"); //$NON-NLS-1$ --===============3629005187539499331==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 08:58:14 2009 Content-Type: multipart/mixed; boundary="===============1945527647436138272==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17585 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/model/options and 1 other directory. Date: Tue, 15 Sep 2009 08:58:14 -0400 Message-ID: <200909151258.n8FCwEGg000324@svn01.web.mwc.hst.phx2.redhat.com> --===============1945527647436138272== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 08:58:14 -0400 (Tue, 15 Sep 2009) New Revision: 17585 Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options= _general.xml trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_= eclipse_option.meta trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_= option.meta trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/options/Preference.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Node 'Editors' moved to Option root Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/= options_general.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/option= s_general.xml 2009-09-15 12:26:34 UTC (rev 17584) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/option= s_general.xml 2009-09-15 12:58:14 UTC (rev 17585) @@ -4431,6 +4431,10 @@ + + + - - - \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/= studio_eclipse_option.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio= _eclipse_option.meta 2009-09-15 12:26:34 UTC (rev 17584) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio= _eclipse_option.meta 2009-09-15 12:58:14 UTC (rev 17585) @@ -193,52 +193,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1139,7 +1093,6 @@ - @@ -1373,6 +1326,16 @@ + + + + + + + + + + Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/= studio_option.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio= _option.meta 2009-09-15 12:26:34 UTC (rev 17584) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio= _option.meta 2009-09-15 12:58:14 UTC (rev 17585) @@ -1,5 +1,6 @@ - + @@ -22,17 +23,12 @@ - - - - - - + - - @@ -95,6 +89,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -105,13 +139,9 @@ - - - - - + @@ -156,25 +186,20 @@ - - - - - - + - + @@ -185,7 +210,9 @@ - + + + @@ -194,11 +221,9 @@ - - @@ -215,11 +240,9 @@ - - @@ -228,10 +251,7 @@ - - - + name=3D"location filters" visibility=3D"false" xmlname=3D"LOCATION_FIL= TERS"/> @@ -262,19 +282,12 @@ - - - - + name=3D"browser prefix" xmlname=3D"BROWSER_PREFIX"/> - - - + name=3D"uddi urls" visibility=3D"false" xmlname=3D"UDDI_URLS"/> @@ -289,11 +302,9 @@ - - @@ -310,10 +321,7 @@ - - - - + Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/options/Preference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/options/Preference.java 2009-09-15 12:26:34 UTC (rev 17584) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/options/Preference.java 2009-09-15 12:58:14 UTC (rev 17585) @@ -22,7 +22,7 @@ private String option; private String attributeName; public static final String OPTIONS_PATH =3D "%Options%"; //$NON-NLS-1$ - public static String EDITOR_PATH =3D "%Options%/Struts Studio/Editors"; /= /$NON-NLS-1$ + public static String EDITOR_PATH =3D "%Options%/Editors"; //$NON-NLS-1$ public static final Preference SHOW_NATURE_WARNING =3D new Preference(EDI= TOR_PATH, "natureWarning"); //$NON-NLS-1$ = protected Preference(String optionPath, String attributeName) { --===============1945527647436138272==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 10:29:50 2009 Content-Type: multipart/mixed; boundary="===============6833297556530535492==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17586 - in trunk/jst: plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common and 5 other directories. Date: Tue, 15 Sep 2009 10:29:50 -0400 Message-ID: <200909151429.n8FEToWJ021746@svn01.web.mwc.hst.phx2.redhat.com> --===============6833297556530535492== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: sdzmitrovich Date: 2009-09-15 10:29:50 -0400 (Tue, 15 Sep 2009) New Revision: 17586 Added: trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebConten= t/pages/JBIDE/4850/ trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebConten= t/pages/JBIDE/4850/cssViewTest.jsp trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css= /test/jbide/ExtendingCSSViewTest_JBIDE4850.java Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSSelectionListener.java trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css= /test/AbstractCSSViewTest.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css= /test/CSSAllTests.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css= /test/CSSViewTest.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css= /test/jbide/InputFractionalValueTest_JBIDE4790.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css= /test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java Log: JBIDE-4850 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-09-= 15 12:58:14 UTC (rev 17585) +++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-09-= 15 14:29:50 UTC (rev 17586) @@ -19,6 +19,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.jst.css, + org.jboss.tools.jst.css.common, org.jboss.tools.jst.css.messages, org.jboss.tools.jst.css.properties, org.jboss.tools.jst.css.view Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/common/CSSSelectionListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSSelectionListener.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSSelectionListener.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -59,11 +59,15 @@ private void startListening() { PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getSelectionService().addPostSelectionListener(this); +// PlatformUI.getWorkbench().getActiveWorkbenchWindow() +// .getSelectionService().addSelectionListener(this); } = private void stopListening() { PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getSelectionService().removePostSelectionListener(this); + // PlatformUI.getWorkbench().getActiveWorkbenchWindow() + // .getSelectionService().addSelectionListener(this); = } = Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2009-= 09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2009-= 09-15 14:29:50 UTC (rev 17586) @@ -20,7 +20,10 @@ org.jboss.tools.jst.css, org.eclipse.core.databinding, org.eclipse.ui.views.properties.tabbed, - org.jboss.tools.jst.jsp + org.jboss.tools.jst.jsp, + org.eclipse.wst.xml.core, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.web Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Added: trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebCo= ntent/pages/JBIDE/4850/cssViewTest.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebConte= nt/pages/JBIDE/4850/cssViewTest.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebConte= nt/pages/JBIDE/4850/cssViewTest.jsp 2009-09-15 14:29:50 UTC (rev 17586) @@ -0,0 +1,16 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%> +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%> + + + + + + + + + + + + + + \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.css.test/resources= /cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/= jst/css/test/AbstractCSSViewTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/AbstractCSSViewTest.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/AbstractCSSViewTest.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -21,12 +21,17 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.jst.css.properties.CSSPropertyPage; +import org.jboss.tools.jst.css.view.CSSEditorView; +import org.jboss.tools.test.util.JobUtils; = /** * @author Sergey Dzmitrovich @@ -43,6 +48,7 @@ public static final String CSS_EDITOR_ID =3D "org.eclipse.wst.css.core.cs= ssource.source"; //$NON-NLS-1$ public static final String CSS_PERSPECTIVE =3D "org.jboss.tools.jst.cssPe= rspective"; //$NON-NLS-1$ public static final String IMPORT_PROJECT_NAME =3D "cssTest"; //$NON-NLS-= 1$ + public static final String CSS_PREVIEW_SELECTED_OBJECT =3D "selectedObjec= t"; //$NON-NLS-1$ = /** * = @@ -88,13 +94,19 @@ public void setSelection(StructuredTextEditor textEditor, int offset, int length) { = - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .activate(textEditor); + activatePart(textEditor); = textEditor.selectAndReveal(offset, length); = + JobUtils.delay(1000); + } = + protected void activatePart(IWorkbenchPart part) { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .activate(part); + } + /** * = */ @@ -118,6 +130,23 @@ = /** * = + * @param viewId + * @return + * @throws PartInitException + */ + public void hideView(String viewId) throws PartInitException { + IWorkbenchPage activePage =3D PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + + IViewPart viewPart =3D activePage.findView(viewId); + if (viewPart !=3D null) + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage().hideView(viewPart); + + } + + /** + * = * @param file * @return */ @@ -146,6 +175,18 @@ return getFieldValue(object, object.getClass(), fieldName); } = + protected Object getSelectedObject(CSSEditorView view) + throws SecurityException, IllegalArgumentException, + NoSuchFieldException, IllegalAccessException { + + CSSPropertyPage page =3D (CSSPropertyPage) view.getCurrentPage(); + + assertNotNull(page); + + return getFieldValue(page, CSS_PREVIEW_SELECTED_OBJECT); + + } + /** * = * @param object Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/= jst/css/test/CSSAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/CSSAllTests.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/CSSAllTests.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -14,6 +14,7 @@ import junit.framework.Test; import junit.framework.TestSuite; = +import org.jboss.tools.jst.css.test.jbide.ExtendingCSSViewTest_JBIDE4850; import org.jboss.tools.jst.css.test.jbide.InputFractionalValueTest_JBIDE47= 90; import org.jboss.tools.jst.css.test.jbide.SelectionLosingByPropertySheet_J= BIDE4791; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -32,9 +33,10 @@ = TestSuite suite =3D new TestSuite("Tests for CSS views"); //$NON-NLS-1$ // $JUnit-BEGIN$ -// suite.addTestSuite(CSSViewTest.class); -// suite.addTestSuite(InputFractionalValueTest_JBIDE4790.class); + suite.addTestSuite(CSSViewTest.class); + suite.addTestSuite(InputFractionalValueTest_JBIDE4790.class); suite.addTestSuite(SelectionLosingByPropertySheet_JBIDE4791.class); + suite.addTestSuite(ExtendingCSSViewTest_JBIDE4850.class); // $JUnit-END$ = return new ProjectImportTestSetup( Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/= jst/css/test/CSSViewTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/CSSViewTest.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/CSSViewTest.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -30,6 +30,7 @@ import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleShe= et; import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.jst.css.common.StyleContainer; import org.jboss.tools.jst.css.properties.CSSPropertyPage; import org.jboss.tools.jst.css.view.CSSEditorView; import org.jboss.tools.jst.css.view.CSSPreview; @@ -43,12 +44,12 @@ */ public class CSSViewTest extends AbstractCSSViewTest { = - public static final String TEST_PAGE_NAME =3D "test.css"; //$NON-NLS-1$ = + public static final String SELECTED_OBJECT_FIELD =3D "selectedObject"; //= $NON-NLS-1$ + public static final int COUNT_TABS =3D 5; = - /** * = * @throws PartInitException @@ -75,10 +76,6 @@ = assertNotNull(view); = - CSSPropertyPage page =3D (CSSPropertyPage) view.getCurrentPage(); - - assertNotNull(page); - ICSSModel model =3D (ICSSModel) getStructuredModel(pageFile); = assertNotNull(model); @@ -96,18 +93,18 @@ = setSelection(editor, offset, 0); = - JobUtils.delay(1000); = - Object selectedObject =3D getFieldValue(page, "selectedObject"); //$NON-= NLS-1$ + Object selectedObject =3D getSelectedObject(view); + assertTrue(selectedObject instanceof StyleContainer); + assertEquals(cssRule, ((StyleContainer) selectedObject) + .getStyleObject()); = setSelection(editor, 0, 0); = - JobUtils.delay(1000); = - selectedObject =3D getFieldValue(page, "selectedObject"); //$NON-NLS-1$ + selectedObject =3D getSelectedObject(view); + assertNull(selectedObject); = - assertNotSame(cssRule, selectedObject); - } = public void testEditorViewTabs() throws CoreException, SecurityException, @@ -149,7 +146,6 @@ = setSelection(editor, offset, 0); = - JobUtils.delay(1000); = TabbedPropertyRegistry registry =3D (TabbedPropertyRegistry) getFieldVal= ue( page, TabbedPropertySheetPage.class, "registry");//$NON-NLS-1$ @@ -214,7 +210,6 @@ = setSelection(editor, offset, 0); = - JobUtils.delay(1000); = assertFalse(browserPage.equals(view.generateBrowserPage())); = Added: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst= /css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/ExtendingCSSViewTest_JBIDE4850.java (r= ev 0) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/ExtendingCSSViewTest_JBIDE4850.java 2009-09-15 14:29:50 UTC (r= ev 17586) @@ -0,0 +1,124 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jst.css.test.jbide; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.jboss.tools.jst.css.common.StyleContainer; +import org.jboss.tools.jst.css.test.AbstractCSSViewTest; +import org.jboss.tools.jst.css.view.CSSEditorView; +import org.jboss.tools.test.util.JobUtils; +import org.w3c.dom.Element; + +/** + * @author Sergey Dzmitrovich + * = + */ +public class ExtendingCSSViewTest_JBIDE4850 extends AbstractCSSViewTest { + + public static final String TEST_PAGE_NAME =3D "JBIDE/4850/cssViewTest.jsp= "; //$NON-NLS-1$ + + /** jsp editor id */ + public static final String JSP_EDITOR_ID =3D "org.eclipse.jst.jsp.core.js= psource.source";//"org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON= -NLS-1$ + + public static final String TESTED_ELEMENT_ID =3D "cssViewTest"; //$NON-NL= S-1$ + + public static final String TESTED_STYLE_ID =3D "styleID"; //$NON-NLS-1$ + + public void testInlineStyleEditing() throws CoreException, + SecurityException, IllegalArgumentException, NoSuchFieldException, + IllegalAccessException { + + IFile pageFile =3D getComponentPath(TEST_PAGE_NAME, getProjectName()); + + assertNotNull(pageFile); + + StructuredTextEditor editor =3D (StructuredTextEditor) openEditor( + pageFile, JSP_EDITOR_ID); + + JobUtils.waitForIdle(); + + assertNotNull(editor); + + CSSEditorView view =3D (CSSEditorView) openView(CSS_EDITOR_VIEW); + + assertNotNull(view); + + IDOMModel model =3D (IDOMModel) getStructuredModel(pageFile); + + assertNotNull(model); + + IDOMDocument document =3D model.getDocument(); + + assertNotNull(document); + + Element element =3D document.getElementById(TESTED_ELEMENT_ID); + + assertNotNull(element); + + int offset =3D ((IndexedRegion) element).getStartOffset(); + + setSelection(editor, offset, 0); + + Object selectedObject =3D getSelectedObject(view); + + assertTrue(selectedObject instanceof StyleContainer); + + assertSame(element, ((StyleContainer) selectedObject).getStyleObject()); + + } + + public void testStyleTagEditing() throws CoreException, SecurityException, + IllegalArgumentException, NoSuchFieldException, + IllegalAccessException { + + IFile pageFile =3D getComponentPath(TEST_PAGE_NAME, getProjectName()); + + assertNotNull(pageFile); + + StructuredTextEditor editor =3D (StructuredTextEditor) openEditor( + pageFile, JSP_EDITOR_ID); + + JobUtils.waitForIdle(); + + assertNotNull(editor); + + CSSEditorView view =3D (CSSEditorView) openView(CSS_EDITOR_VIEW); + + assertNotNull(view); + + IDOMModel model =3D (IDOMModel) getStructuredModel(pageFile); + + assertNotNull(model); + + IDOMDocument document =3D model.getDocument(); + + assertNotNull(document); + + Element element =3D document.getElementById(TESTED_STYLE_ID); + + assertNotNull(element); + + int offset =3D ((IDOMElement) element).getStartEndOffset(); + + setSelection(editor, offset, 0); + + Object selectedObject =3D getSelectedObject(view); + + assertTrue(selectedObject instanceof StyleContainer); + + } +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/j= boss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/= jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-15 12:58:14 UT= C (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-15 14:29:50 UT= C (rev 17586) @@ -111,7 +111,7 @@ newTestedValue); = } catch (DOMException e) { - fail("Changing of attribute's value leads to DOMException. Probably it = is regression of JBIDE-4790 "); //$NON-NLS-1$ + fail("Changing of attribute's value leads to DOMException. Probably it = is problem concerned with of JBIDE-4790 "); //$NON-NLS-1$ } testedValue =3D declaration.getPropertyValue(TEST_CSS_ATTRIBUTE_NAME); = Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/= jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2009-09-15 12:58= :14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2009-09-15 14:29= :50 UTC (rev 17586) @@ -82,9 +82,9 @@ .getFirstElement()); = CSSEditorView view =3D (CSSEditorView) openView(CSS_EDITOR_VIEW); - = - JobUtils.delay(2000); = + JobUtils.delay(1000); + selection =3D (ISelection) getFieldValue(propertySheet, SELECTION_FIELD_NAME); = --===============6833297556530535492==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 10:54:19 2009 Content-Type: multipart/mixed; boundary="===============2997398118455008710==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17587 - trunk/struts/plugins/org.jboss.tools.struts. Date: Tue, 15 Sep 2009 10:54:19 -0400 Message-ID: <200909151454.n8FEsJhA026524@svn01.web.mwc.hst.phx2.redhat.com> --===============2997398118455008710== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 10:54:19 -0400 (Tue, 15 Sep 2009) New Revision: 17587 Modified: trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml Log: Modified: trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml 2009-09-15 = 14:29:50 UTC (rev 17586) +++ trunk/struts/plugins/org.jboss.tools.struts/Preferences.xml 2009-09-15 = 14:54:19 UTC (rev 17587) @@ -1,6 +1,13 @@ + + + @@ -68,13 +75,6 @@ NAME=3D"Default Error Messages" SCOPE=3D"project" text=3D"errors.req= uired=3D{0} is required.\n\nerrors.minlength=3D{0} can not be less than {1}= characters.\nerrors.maxlength=3D{0} can not be greater than {1} characters= .\nerrors.invalid=3D{0} is invalid.\n \nerrors.byte=3D{0} must be a byte.\n= errors.short=3D{0} must be a short.\nerrors.integer=3D{0} must be an intege= r.\nerrors.long=3D{0} must be a long.\nerrors.float=3D{0} must be a float.\= nerrors.double=3D{0} must be a double.\n \nerrors.date=3D{0} is not a date.= \nerrors.range=3D{0} is not in the range {1} through {2}.\nerrors.creditcar= d=3D{0} is an invalid credit card number.\nerrors.email=3D{0} is an invalid= e-mail address.\n"/> - - - --===============2997398118455008710==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:02:31 2009 Content-Type: multipart/mixed; boundary="===============8595291632845890993==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17588 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search and 1 other directory. Date: Tue, 15 Sep 2009 11:02:31 -0400 Message-ID: <200909151502.n8FF2Vna028239@svn01.web.mwc.hst.phx2.redhat.com> --===============8595291632845890993== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2009-09-15 11:02:30 -0400 (Tue, 15 Sep 2009) New Revision: 17588 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRefactorSearcher.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRenameMethodParticipant.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/s= earch/SeamELReferencesQueryParticipant.java Log: https://jira.jboss.org/jira/browse/JBIDE-4856 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRefactorSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-15 14:54:19 UTC = (rev 17587) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-15 15:02:30 UTC = (rev 17588) @@ -253,10 +253,10 @@ if(expression !=3D null){ if(expression instanceof ELPropertyInvocation){ ELPropertyInvocation pi =3D (ELPropertyInvocation)expression; - match(file, offset+pi.getStartPosition(), pi.getName().getStart()+p= i.getName().getLength()-pi.getStartPosition()); + match(file, offset+pi.getName().getStart(), pi.getName().getLength(= )); }else if(expression instanceof ELMethodInvocation){ ELMethodInvocation mi =3D (ELMethodInvocation)expression; - match(file, offset+mi.getStartPosition(), mi.getName().getStart()+m= i.getName().getLength()-mi.getStartPosition()); + match(file, offset+mi.getName().getStart(), mi.getName().getLength(= )); } } } @@ -325,12 +325,16 @@ protected abstract void match(IFile file, int offset, int length); = public static String getPropertyName(String methodName){ - if(methodName.startsWith(GET) || methodName.startsWith(SET)) - return methodName.substring(3).toLowerCase(); + if(methodName.startsWith(GET) || methodName.startsWith(SET)){ + String name =3D methodName.substring(3); + return name.substring(0, 1).toLowerCase()+name.substring(1); + } = - if(methodName.startsWith(IS)) - return methodName.substring(2).toLowerCase(); + if(methodName.startsWith(IS)){ + String name =3D methodName.substring(2); + return name.substring(0, 1).toLowerCase()+name.substring(1); + } = - return methodName.toLowerCase(); + return methodName; } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRenameMethodParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRenameMethodParticipant.java 2009-09-15 14:54:= 19 UTC (rev 17587) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRenameMethodParticipant.java 2009-09-15 15:02:= 30 UTC (rev 17588) @@ -10,33 +10,52 @@ ************************************************************************= ******/ package org.jboss.tools.seam.internal.core.refactoring; = +import java.util.ArrayList; + import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.jdt.core.IMethod; import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.TextFileChange; import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContex= t; import org.eclipse.ltk.core.refactoring.participants.RenameParticipant; +import org.eclipse.ltk.internal.core.refactoring.Messages; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.text.edits.ReplaceEdit; +import org.eclipse.text.edits.TextEdit; +import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.el.core.model.ELMethodInvocation; +import org.jboss.tools.common.el.core.model.ELPropertyInvocation; +import org.jboss.tools.seam.core.SeamCoreMessages; = public class SeamRenameMethodParticipant extends RenameParticipant{ private IMethod method; private String oldName; private String newName; private SeamRenameMethodSearcher searcher; + private RefactoringStatus status; + private CompositeChange rootChange; + private TextFileChange lastChange; + private ArrayList keys =3D new ArrayList(); = = @Override public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException { - return null; + searcher.findELReferences(); + = + return status; } = @Override public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException { - return null; + return rootChange; } = @Override @@ -47,16 +66,49 @@ @Override protected boolean initialize(Object element) { if(element instanceof IMethod){ + status =3D new RefactoringStatus(); + = + rootChange =3D new CompositeChange(""); method =3D (IMethod)element; - oldName =3D method.getElementName(); - newName =3D getArguments().getNewName(); = + oldName =3D SeamRenameMethodSearcher.getPropertyName(method.getElementN= ame()); + newName =3D SeamRenameMethodSearcher.getPropertyName(getArguments().get= NewName()); searcher =3D new SeamRenameMethodSearcher((IFile)method.getResource(), = oldName); return true; } return false; } = + protected TextFileChange getChange(IFile file){ + if(lastChange !=3D null && lastChange.getFile().equals(file)) + return lastChange; + = + for(int i=3D0; i < rootChange.getChildren().length; i++){ + TextFileChange change =3D (TextFileChange)rootChange.getChildren()[i]; + if(change.getFile().equals(file)){ + lastChange =3D change; + return lastChange; + } + } + lastChange =3D new TextFileChange(file.getName(), file); + MultiTextEdit root =3D new MultiTextEdit(); + lastChange.setEdit(root); + rootChange.add(lastChange); + = + return lastChange; + } + = + private void change(IFile file, int offset, int length, String text){ + //System.out.println("change file - "+file.getFullPath()+" offset - "+of= fset+" len - "+length+" text <"+text+">"); + String key =3D file.getFullPath().toString()+" "+offset; + if(!keys.contains(key)){ + TextFileChange change =3D getChange(file); + TextEdit edit =3D new ReplaceEdit(offset, length, text); + //change.addEdit(edit); + keys.add(key); + } + } + = class SeamRenameMethodSearcher extends SeamRefactorSearcher{ public SeamRenameMethodSearcher(IFile file, String name){ super(file, name); @@ -64,11 +116,37 @@ = @Override protected boolean isFileCorrect(IFile file) { - return false; + if(!file.isSynchronized(IResource.DEPTH_ZERO)){ + status.addFatalError(Messages.format(SeamCoreMessages.SEAM_RENAME_PROC= ESSOR_OUT_OF_SYNC_FILE, file.getFullPath().toString())); + return false; + }else if(file.isPhantom()){ + status.addFatalError(Messages.format(SeamCoreMessages.SEAM_RENAME_PROC= ESSOR_ERROR_PHANTOM_FILE, file.getFullPath().toString())); + return false; + }else if(file.isReadOnly()){ + status.addFatalError(Messages.format(SeamCoreMessages.SEAM_RENAME_PROC= ESSOR_ERROR_READ_ONLY_FILE, file.getFullPath().toString())); + return false; + } + return true; } + = + protected ELInvocationExpression findComponentReference(ELInvocationExpr= ession invocationExpression){ + ELInvocationExpression invExp =3D invocationExpression; + while(invExp !=3D null){ + if(invExp instanceof ELMethodInvocation || invExp instanceof ELPropert= yInvocation){ + if(invExp.getMemberName() !=3D null && invExp.getMemberName().equals(= propertyName)) + return invExp; + else + invExp =3D invExp.getLeft(); + }else{ + invExp =3D invExp.getLeft(); + } + } + return null; + } = @Override protected void match(IFile file, int offset, int length) { + change(file, offset, length, newName); } } = Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/search/SeamELReferencesQueryParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= search/SeamELReferencesQueryParticipant.java 2009-09-15 14:54:19 UTC (rev 1= 7587) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= search/SeamELReferencesQueryParticipant.java 2009-09-15 15:02:30 UTC (rev 1= 7588) @@ -93,7 +93,7 @@ ELInvocationExpression invExp =3D invocationExpression; while(invExp !=3D null){ if(invExp instanceof ELMethodInvocation || invExp instanceof ELPropert= yInvocation){ - if(invExp.getMemberName() !=3D null && invExp.getMemberName().equalsI= gnoreCase(propertyName)) + if(invExp.getMemberName() !=3D null && invExp.getMemberName().equals(= propertyName)) return invExp; else invExp =3D invExp.getLeft(); --===============8595291632845890993==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:11:24 2009 Content-Type: multipart/mixed; boundary="===============7802102969468560644==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17591 - in trunk/jsf/plugins/org.jboss.tools.jsf: resources/help and 1 other directory. Date: Tue, 15 Sep 2009 11:11:24 -0400 Message-ID: <200909151511.n8FFBOBM030782@svn01.web.mwc.hst.phx2.redhat.com> --===============7802102969468560644== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 11:11:23 -0400 (Tue, 15 Sep 2009) New Revision: 17591 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.propert= ies Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Extension point added and eclipse options splitted between common and jst Modified: trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml 2009-09-15 15:10:= 31 UTC (rev 17590) +++ trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml 2009-09-15 15:11:= 23 UTC (rev 17591) @@ -1,6 +1,13 @@ + + + @@ -68,13 +75,6 @@ NAME=3D"Default Error Messages" SCOPE=3D"project" text=3D"errors.req= uired=3D{0} is required.\n\nerrors.minlength=3D{0} can not be less than {1}= characters.\nerrors.maxlength=3D{0} can not be greater than {1} characters= .\nerrors.invalid=3D{0} is invalid.\n \nerrors.byte=3D{0} must be a byte.\n= errors.short=3D{0} must be a short.\nerrors.integer=3D{0} must be an intege= r.\nerrors.long=3D{0} must be a long.\nerrors.float=3D{0} must be a float.\= nerrors.double=3D{0} must be a double.\n \nerrors.date=3D{0} is not a date.= \nerrors.range=3D{0} is not in the range {1} through {2}.\nerrors.creditcar= d=3D{0} is an invalid credit card number.\nerrors.email=3D{0} is an invalid= e-mail address.\n"/> - - - Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.pro= perties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.propertie= s 2009-09-15 15:10:31 UTC (rev 17590) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.propertie= s 2009-09-15 15:11:23 UTC (rev 17591) @@ -661,3 +661,43 @@ FaceletTaglibConverter_Properties.Title=3DFacelet Converter FaceletTaglibValidator_Properties.Title=3DFacelet Validator FaceletTaglibSource_Properties.Title=3DFacelet Tag Source + +# New Eclipse4Web JSF Project wizard +newJSFLightProjectPage1_introduction=3DThe Create New Project Wizard is us= ed for creating a brand new project. If you already have a pre-existing pro= ject, just use the Import Project Wizard to start working with it in Eclips= e4Web. +newJSFLightProjectPage1_name =3D Project Name +newJSFLightProjectPage1_location =3D Location +newJSFLightProjectPage1_use_default_path =3D Use default path +newJSFLightProjectPage1_version =3D JSF Environment +newJSFLightProjectPage1_template =3D Template + +newJSFLightProjectPage1_specifyProjectName =3D Specify Project Name +newJSFLightProjectPage1_specifyLocation =3D Specify location +newJSFLightProjectPage1_locationError =3D Location Error +newJSFLightProjectPage1_projectExistsMessage =3D Project already exists + +# New JSF Project wizard +NEW_JSF_PROJECT_WIZARD_WINDOW_TITLE =3D New JSF Project +NEW_JSF_PROJECT_WIZARD_CREATE_STRUTS_PROJECT =3D Create JSF Project + +newJSFProjectPage1_introduction=3DThe Create New Project Wizard is used fo= r creating a brand new project. If you already have a pre-existing project,= just use the Import Project Wizard to start working with it in JBoss Tools. +newJSFProjectPage1_name =3D Project Name +newJSFProjectPage1_location =3D Location +newJSFProjectPage1_use_default_path =3D Use default path +newJSFProjectPage1_version =3D JSF Environment +newJSFProjectPage1_template =3D Template + +newJSFProjectPage1_specifyProjectName =3D Specify Project Name +newJSFProjectPage1_specifyLocation =3D Specify location +newJSFProjectPage1_locationError =3D Location Error +newJSFProjectPage1_projectExistsMessage =3D Project already exists +# Errors +NewJSFProjectWizard.CannotCreateLocation.WindowTitle =3D Error +NewJSFProjectWizard.CannotCreateLocation.ErrorMessage =3D Cannot create sp= ecify location + +org.jboss.tools.jsf.ui.wizard.project.ImportJSFWarWizard.mainPageTitle=3DJ= SF project + +IMPORT_JSF_PROJECT_WIZARD_WINDOW_TITLE =3D Import JSF Project +ADD_JSF_NATURE =3D Add JSF Capabilities + +SharableImportJSFProject.Register_Web_Context_in_server.xml=3DRegister Web= Context in server.xml +SharableNewJSFProject.Register_Web_Context_in_server.xml=3DRegister Web Co= ntext in server.xml Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.= properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.proper= ties 2009-09-15 15:10:31 UTC (rev 17590) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf_ja.proper= ties 2009-09-15 15:11:23 UTC (rev 17591) @@ -328,3 +328,36 @@ JSFValidatorExtension_CreateTag.WindowTitle=3D\u30BF\u30B0\u306E\u8FFD\u52= A0 JSFValidatorExtension_CreateTag.Title=3D\u30BF\u30B0 JSFConfigExtensions_Properties.Title=3D\u62E1\u5F35 + +newJSFLightProjectPage1_introduction=3D\u65B0\u898F\u30D7\u30ED\u30B8\u30A= 7\u30AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B0\u= 898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u752= 8\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u= 30C8\u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u306= E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306B\u= 306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C= 8\u30FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u= 3060\u3055\u3044\u3002 +newJSFLightProjectPage1_name=3D\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D +newJSFLightProjectPage1_location=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 +newJSFLightProjectPage1_use_default_path=3D\u30C7\u30D5\u30A9\u30EB\u30C8\= u30FB\u30D1\u30B9\u3092\u4F7F\u7528 +newJSFLightProjectPage1_version=3DJSF \u74B0\u5883 +newJSFLightProjectPage1_template=3D\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +newJSFLightProjectPage1_specifyProjectName=3D\u30D7\u30ED\u30B8\u30A7\u30A= F\u30C8\u540D\u3092\u6307\u5B9A +newJSFLightProjectPage1_specifyLocation=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u= 30F3\u3092\u6307\u5B9A\u3057\u307E\u3059 +newJSFLightProjectPage1_locationError=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30= F3\u30FB\u30A8\u30E9\u30FC +newJSFLightProjectPage1_projectExistsMessage=3D\u30D7\u30ED\u30B8\u30A7\u3= 0AF\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059 +NEW_JSF_PROJECT_WIZARD_WINDOW_TITLE=3D\u65B0\u898F JSF \u30D7\u30ED\u30B8\= u30A7\u30AF\u30C8 +NEW_JSF_PROJECT_WIZARD_CREATE_STRUTS_PROJECT=3DJSF \u30D7\u30ED\u30B8\u30A= 7\u30AF\u30C8\u306E\u4F5C\u6210 +newJSFProjectPage1_introduction=3D\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30= AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B0\u898F\= u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u30= 57\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\= u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u306E\u30= D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306B\u306F\= u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C8\u30= FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\= u3055\u3044\u3002 +newJSFProjectPage1_name=3D\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D +newJSFProjectPage1_location=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 +newJSFProjectPage1_use_default_path=3D\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB= \u30D1\u30B9\u3092\u4F7F\u7528 +newJSFProjectPage1_version=3DJSF \u74B0\u5883 +newJSFProjectPage1_template=3D\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +newJSFProjectPage1_specifyProjectName=3D\u30D7\u30ED\u30B8\u30A7\u30AF\u30= C8\u540D\u3092\u6307\u5B9A +newJSFProjectPage1_specifyLocation=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\= u3092\u6307\u5B9A\u3057\u307E\u3059 +newJSFProjectPage1_locationError=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3= 0FB\u30A8\u30E9\u30FC +newJSFProjectPage1_projectExistsMessage=3D\u30D7\u30ED\u30B8\u30A7\u30AF\u= 30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059 +NewJSFProjectWizard.CannotCreateLocation.WindowTitle=3D\u30A8\u30E9\u30FC +NewJSFProjectWizard.CannotCreateLocation.ErrorMessage=3D\u6307\u5B9A\u3055= \u308C\u305F\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4F5C\u6210\u3067\u3= 04D\u307E\u305B\u3093 + +org.jboss.tools.jsf.ui.wizard.project.ImportJSFWarWizard.mainPageTitle=3DJ= SF \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 + +IMPORT_JSF_PROJECT_WIZARD_WINDOW_TITLE=3DJSF \u30D7\u30ED\u30B8\u30A7\u30A= F\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8 +ADD_JSF_NATURE=3DJSF \u6A5F\u80FD\u306E\u8FFD\u52A0 + +SharableImportJSFProject.Register_Web_Context_in_server.xml=3Dserver.xml \= u306B Web \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u767B\u9332 +SharableNewJSFProject.Register_Web_Context_in_server.xml=3Dserver.xml \u30= 6B Web \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3092\u767B\u9332 --===============7802102969468560644==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:12:07 2009 Content-Type: multipart/mixed; boundary="===============8822525229575765114==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17592 - trunk/struts/plugins/org.jboss.tools.struts/resources/help. Date: Tue, 15 Sep 2009 11:12:07 -0400 Message-ID: <200909151512.n8FFC7MM030880@svn01.web.mwc.hst.phx2.redhat.com> --===============8822525229575765114== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 11:12:06 -0400 (Tue, 15 Sep 2009) New Revision: 17592 Added: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_j= a.properties Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.p= roperties Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Extension point added and eclipse options split between common and jst Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-s= truts.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.= properties 2009-09-15 15:11:23 UTC (rev 17591) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.= properties 2009-09-15 15:12:06 UTC (rev 17592) @@ -938,3 +938,88 @@ SharableStrutsEditor.showShortcutIcon=3DShow shortcut icon SharableStrutsEditor.showShortcutPath=3DShow shortcut path SharableStrutsEditor.Show_Grid=3DShow grid + +SharableStruts10Support.servlet_class=3DServlet Class +SharableStruts10Support.url_pattern=3DURL Pattern +SharableStruts10Support.tld_files=3DTLD Files +SharableStruts11Support.servlet_class=3DServlet Class +SharableStruts11Support.url_pattern=3DURL Pattern +SharableStruts11Support.tld_files=3DTLD Files + +SharableStrutsEditor.doNotShowDiagram=3DDo not show diagram tab + +# New Struts Project wizard +NEW_STRUTS_PROJECT_WIZARD_WINDOW_TITLE =3D New Struts Project +NEW_STRUTS_PROJECT_WIZARD_CREATE_STRUTS_PROJECT =3D Create Struts Project + +newStrutsProjectPage1_introduction=3DThe Create New Project Wizard is used= for creating a brand new project. If you already have a pre-existing proje= ct, just use the Import Project Wizard to start working with it in JBoss To= ols. +newStrutsProjectPage1_name =3D Project Name +newStrutsProjectPage1_location =3D Location +newStrutsProjectPage1_use_default_path =3D Use default path +newStrutsProjectPage1_version =3D Struts Environment +newStrutsProjectPage1_template =3D Template +WebPrjCreateStepDirs_servletVersion=3DServlet Version + +newStrutsProjectPage1_specifyProjectName =3D Specify Project Name +newStrutsProjectPage1_specifyLocation =3D Specify location +newStrutsProjectPage1_locationError =3D Location Error +newStrutsProjectPage1_projectExistsMessage =3D Project already exists +# Errors +NewStrutsProjectWizard.CannotCreateLocation.WindowTitle =3D Error +NewStrutsProjectWizard.CannotCreateLocation.ErrorMessage =3D Cannot create= specify location + +# New Eclipse4Web Struts Project wizard +newStrutsLightProjectPage1_introduction=3DThe Create New Project Wizard is= used for creating a brand new project. If you already have a pre-existing = project, just use the Import Project Wizard to start working with it in Ecl= ipse4Web. +newStrutsLightProjectPage1_name =3D Project Name +newStrutsLightProjectPage1_location =3D Location +newStrutsLightProjectPage1_use_default_path =3D Use default path +newStrutsLightProjectPage1_version =3D Struts Environment +newStrutsLightProjectPage1_template =3D Template + +newStrutsLightProjectPage1_specifyProjectName =3D Specify Project Name +newStrutsLightProjectPage1_specifyLocation =3D Specify location +newStrutsLightProjectPage1_locationError =3D Location Error +newStrutsLightProjectPage1_projectExistsMessage =3D Project already exists + +# Import Struts Project wizard +IMPORT_STRUTS_PROJECT_WIZARD_WINDOW_TITLE =3D Import Struts Project +IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_LOCATION =3D Project Location +IMPORT_STRUTS_PROJECT_SELECT_WEB_XML =3D Please select web.xml location +IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_MODULES =3D Project Modules +IMPORT_STRUTS_PROJECT_CONFIGURE_PROJECT_MODULES =3D Configure Project Modu= les +IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_FOLDERS =3D Project Folders +IMPORT_STRUTS_PROJECT_SELECT_PROJECT_FOLDERS =3D Select Project Folders + +ADD_STRUTS_NATURE =3D Add Struts Capabilities + +org.jboss.tools.struts.ui.wizard.project.ImportStrutsWarWizard.mainPageTit= le=3DStruts project + +IMPORT_STRUTS_PROJECT_EARLIER_VERSION_WARNING=3DThis project has been crea= ted in an earlier version of Struts Studio. Select Yes if you want import a= nd convert this project to the current version. Once this project is conver= ted you will not be able to open it in a previous version. Select No if you= want to cancel project import and leave it as it is. + +#Wizard-Labels.begin + +# Generate java code - step 1 +StrutsGen11_Start_actions =3D Generate classes for Actions +StrutsGen11_Start_formbeans =3D Generate classes for FormBeans +StrutsGen11_Start_forwards =3D Generate classes for Forwards +StrutsGen11_Start_exceptions =3D Generate classes for Exceptions +StrutsGen11_Start_overwrite =3D Overwrite existing files +StrutsGen11_Start_base_package =3D Base package +# Generate java code - step 2 +StrutsGen11_Actions_base_class =3D Base class +StrutsGen11_Actions_properties =3D Generate JavaBeans properties +StrutsGen11_Actions_global_forwards =3D Generate constraints for global fo= rwards +StrutsGen11_Actions_local_forwards =3D Generate constraints for local forw= ards +# Generate java code - step 3 +StrutsGen11_FormBeans_base_class =3D Base class +StrutsGen11_FormBeans_properties =3D Generate JavaBeans properties +# Generate java code - step 4 +StrutsGen11_Forwards_base_class =3D Base class +StrutsGen11_Forwards_properties =3D Generate JavaBeans properties +# Generate java code - step 5 +StrutsGen11_Exceptions_base_class =3D Base class +StrutsGen11_Exceptions_properties =3D Generate JavaBeans properties + +#Wizard-Labels.end + + Added: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-stru= ts_ja.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_= ja.properties (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_= ja.properties 2009-09-15 15:12:06 UTC (rev 17592) @@ -0,0 +1,61 @@ +SharableStruts10Support.servlet_class=3D\u30B5\u30FC\u30D6\u30EC\u30C3\u30= C8\u30FB\u30AF\u30E9\u30B9 +SharableStruts10Support.url_pattern=3DURL \u30D1\u30BF\u30FC\u30F3 +SharableStruts10Support.tld_files=3DTLD \u30D5\u30A1\u30A4\u30EB +SharableStruts11Support.servlet_class=3D\u30B5\u30FC\u30D6\u30EC\u30C3\u30= C8\u30FB\u30AF\u30E9\u30B9 +SharableStruts11Support.url_pattern=3DURL \u30D1\u30BF\u30FC\u30F3 +SharableStruts11Support.tld_files=3DTLD \u30D5\u30A1\u30A4\u30EB + +SharableStrutsEditor.doNotShowDiagram=3D\u30C0\u30A4\u30A2\u30B0\u30E9\u30= E0\u30FB\u30BF\u30D6\u3092\u8868\u793A\u3057\u306A\u3044 + +NEW_STRUTS_PROJECT_WIZARD_WINDOW_TITLE=3D\u65B0\u898F Struts \u30D7\u30ED\= u30B8\u30A7\u30AF\u30C8 +NEW_STRUTS_PROJECT_WIZARD_CREATE_STRUTS_PROJECT=3DStruts \u30D7\u30ED\u30B= 8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210 +newStrutsProjectPage1_introduction=3D\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\= u30AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B0\u89= 8F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\= u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30= C8\u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u306E\= u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306B\u30= 6F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u30C8\= u30FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u30= 60\u3055\u3044\u3002 +newStrutsProjectPage1_name=3D\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D +newStrutsProjectPage1_location=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 +newStrutsProjectPage1_use_default_path=3D\u30C7\u30D5\u30A9\u30EB\u30C8\u3= 0FB\u30D1\u30B9\u3092\u4F7F\u7528 +newStrutsProjectPage1_version=3DStruts \u74B0\u5883 +newStrutsProjectPage1_template=3D\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +WebPrjCreateStepDirs_servletVersion=3D\u30B5\u30FC\u30D6\u30EC\u30C3\u30C8= \u30FB\u30D0\u30FC\u30B8\u30E7\u30F3 +newStrutsProjectPage1_specifyProjectName=3D\u30D7\u30ED\u30B8\u30A7\u30AF\= u30C8\u540D\u3092\u6307\u5B9A +newStrutsProjectPage1_specifyLocation=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30= F3\u3092\u6307\u5B9A\u3057\u307E\u3059 +newStrutsProjectPage1_locationError=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3= \u30FB\u30A8\u30E9\u30FC +newStrutsProjectPage1_projectExistsMessage=3D\u30D7\u30ED\u30B8\u30A7\u30A= F\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059 +NewStrutsProjectWizard.CannotCreateLocation.WindowTitle=3D\u30A8\u30E9\u30= FC +NewStrutsProjectWizard.CannotCreateLocation.ErrorMessage=3D\u6307\u5B9A\u3= 055\u308C\u305F\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4F5C\u6210\u3067= \u304D\u307E\u305B\u3093 +newStrutsLightProjectPage1_introduction=3D\u65B0\u898F\u30D7\u30ED\u30B8\u= 30A7\u30AF\u30C8\u4F5C\u6210\u30A6\u30A3\u30B6\u30FC\u30C9\u306F\u3001\u65B= 0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u= 7528\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D7\u30ED\u30B8\u30A7\u30A= F\u30C8\u304C\u3042\u308B\u306A\u3089\u3070\u3001JBoss Tools \u3067\u305D\u= 306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5229\u7528\u3059\u308B\u306= B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30A4\u30F3\u30DD\u30FC\u= 30C8\u30FB\u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304= F\u3060\u3055\u3044\u3002 +newStrutsLightProjectPage1_name=3D\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u54= 0D +newStrutsLightProjectPage1_location=3D\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 +newStrutsLightProjectPage1_use_default_path=3D\u30C7\u30D5\u30A9\u30EB\u30= C8\u30FB\u30D1\u30B9\u3092\u4F7F\u7528 +newStrutsLightProjectPage1_version=3DStruts \u74B0\u5883 +newStrutsLightProjectPage1_template=3D\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +newStrutsLightProjectPage1_specifyProjectName=3D\u30D7\u30ED\u30B8\u30A7\u= 30AF\u30C8\u540D\u3092\u6307\u5B9A +newStrutsLightProjectPage1_specifyLocation=3D\u30ED\u30B1\u30FC\u30B7\u30E= 7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059 +newStrutsLightProjectPage1_locationError=3D\u30ED\u30B1\u30FC\u30B7\u30E7\= u30F3\u30FB\u30A8\u30E9\u30FC +newStrutsLightProjectPage1_projectExistsMessage=3D\u30D7\u30ED\u30B8\u30A7= \u30AF\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059 +IMPORT_STRUTS_PROJECT_WIZARD_WINDOW_TITLE=3DStruts \u30D7\u30ED\u30B8\u30A= 7\u30AF\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8 +IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_LOCATION=3D\u30D7\u30ED\u30B8\u30A7\u= 30AF\u30C8\u30FB\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3 +IMPORT_STRUTS_PROJECT_SELECT_WEB_XML=3Dweb.xml \u30ED\u30B1\u30FC\u30B7\u3= 0E7\u30F3\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 +IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_MODULES=3D\u30D7\u30ED\u30B8\u30A7\u3= 0AF\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB +IMPORT_STRUTS_PROJECT_CONFIGURE_PROJECT_MODULES=3D\u30D7\u30ED\u30B8\u30A7= \u30AF\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u69CB\u6210 +IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_FOLDERS=3D\u30D7\u30ED\u30B8\u30A7\u3= 0AF\u30C8\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC +IMPORT_STRUTS_PROJECT_SELECT_PROJECT_FOLDERS=3D\u30D7\u30ED\u30B8\u30A7\u3= 0AF\u30C8\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u9078\u629E +ADD_STRUTS_NATURE=3DStruts \u6A5F\u80FD\u306E\u8FFD\u52A0 +org.jboss.tools.struts.ui.wizard.project.ImportStrutsWarWizard.mainPageTit= le=3DStruts \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 +IMPORT_STRUTS_PROJECT_EARLIER_VERSION_WARNING=3DThis project has been crea= ted in an earlier version of Struts Studio. Select Yes if you want import a= nd convert this project to the current version. Once this project is conver= ted you will not be able to open it in a previous version. Select No if you= want to cancel project import and leave it as it is. + +StrutsGen11_Start_actions=3DGenerate classes for Actions +StrutsGen11_Start_formbeans=3DGenerate classes for FormBeans +StrutsGen11_Start_forwards=3DGenerate classes for Forwards +StrutsGen11_Start_exceptions=3DGenerate classes for Exceptions +StrutsGen11_Start_overwrite=3D\u65E2\u5B58\u30D5\u30A1\u30A4\u30EB\u306E\u= 4E0A\u66F8\u304D +StrutsGen11_Start_base_package=3DBase package +StrutsGen11_Actions_base_class=3D\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9 +StrutsGen11_Actions_properties=3DGenerate JavaBeans properties +StrutsGen11_Actions_global_forwards=3DGenerate constraints for global forw= ards +StrutsGen11_Actions_local_forwards=3DGenerate constraints for local forwar= ds +StrutsGen11_FormBeans_base_class=3D\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u3= 0B9 +StrutsGen11_FormBeans_properties=3DGenerate JavaBeans properties +StrutsGen11_Forwards_base_class=3D\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30= B9 +StrutsGen11_Forwards_properties=3DGenerate JavaBeans properties +StrutsGen11_Exceptions_base_class=3D\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u= 30B9 +StrutsGen11_Exceptions_properties=3DGenerate JavaBeans properties Property changes on: trunk/struts/plugins/org.jboss.tools.struts/resources/= help/keys-struts_ja.properties ___________________________________________________________________ Name: svn:mime-type + text/plain --===============8822525229575765114==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:20:29 2009 Content-Type: multipart/mixed; boundary="===============4676876233960637185==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17593 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el. Date: Tue, 15 Sep 2009 11:20:29 -0400 Message-ID: <200909151520.n8FFKTVF032500@svn01.web.mwc.hst.phx2.redhat.com> --===============4676876233960637185== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-15 11:20:28 -0400 (Tue, 15 Sep 2009) New Revision: 17593 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/el/AbstractELCompletionEngine.java Log: JBIDE-512 context variable code completion dropdown should show their "sour= ce" JBIDE-2541 Show java-doc for EL content assist item The values of type, sourceType and JavaDoc are gathered to be displayed in = CA Var's declared using var attribute () are also processed. Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/el/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-15 15:12:06 UTC (rev 17592) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-15 15:20:28 UTC (rev 17593) @@ -255,20 +255,37 @@ } = // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> - // TODO: Add type, sourceType and JavaDoc found if possible - // Reason of incomplete: there are no resolved members here, = - // The var value is to be resolved by the ELResolver to let us know - // what is the var's type if(!returnEqualedVariablesOnly && vars!=3Dnull) { = for (Var v : vars) { String prefix =3D operand.toString(); if(v.getName().startsWith(prefix)) { + MemberInfo memberInfo =3D resolveEL(file, v.getElToken(), true, vars,= varSearcher); + String sourceTypeName =3D memberInfo =3D=3D null ? null : memberInfo.= getDeclaringTypeQualifiedName(); + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + String typeName =3D memberInfo =3D=3D null ? null : memberInfo.getTyp= e().getName(); + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + typeName =3D Signature.getSimpleName(typeName); + = + IJavaElement element =3D memberInfo =3D=3D null ? null : memberInfo.g= etJavaElement(); + String attachedJavaDoc =3D null; + = + try { + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); + } catch (JavaModelException e) { + // Ignore + } + = String varNameProposal =3D v.getName().substring(prefix.length()); TextProposal proposal =3D new TextProposal(); + proposal.setLabel(v.getName()); proposal.setReplacementString(varNameProposal); proposal.setLabel(v.getName()); proposal.setImage(getELProposalImage()); + proposal.setType(typeName); + proposal.setSourceType(sourceTypeName); + proposal.setContextInfo(attachedJavaDoc); status.getProposals().add(proposal); } } @@ -294,6 +311,21 @@ return status.getMemberOfResolvedOperand(); } = + /** + * Returns MemberInfo for last segment of EL. Null if El is not resolved. + * @param seamProject + * @param file + * @param operand EL without #{} + * @return MemberInfo for last segment of EL. Null if El is not resolved. + * @throws BadLocationException + * @throws StringIndexOutOfBoundsException + */ + public TypeInfoCollector.MemberInfo resolveEL(IFile file, ELExpression op= erand, boolean returnEqualedVariablesOnly, Listvars, ElVarSearcher va= rSearcher) throws BadLocationException, StringIndexOutOfBoundsException { + if(!(operand instanceof ELInvocationExpression)) return null; + ELOperandResolveStatus status =3D resolveELOperand(file, operand, return= EqualedVariablesOnly, vars, varSearcher); + return status.getMemberOfResolvedOperand(); + } + = public ELOperandResolveStatus resolveELOperand(IFile file, ELExpression o= perand, = boolean returnEqualedVariablesOnly, boolean varIsUsed) throws BadLocati= onException, StringIndexOutOfBoundsException { if(!(operand instanceof ELInvocationExpression) || file =3D=3D null) { @@ -371,6 +403,7 @@ } = TextProposal proposal =3D new TextProposal(); + proposal.setLabel(varName); proposal.setReplacementString(varName.substring(operand.getLength())); setImage(proposal, var); proposal.setType(typeName); --===============4676876233960637185==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:34:12 2009 Content-Type: multipart/mixed; boundary="===============4067013169629213722==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17594 - trunk/hibernatetools/docs/reference/en/modules. Date: Tue, 15 Sep 2009 11:34:12 -0400 Message-ID: <200909151534.n8FFYCn9002178@svn01.web.mwc.hst.phx2.redhat.com> --===============4067013169629213722== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: chukhutsina Date: 2009-09-15 11:34:12 -0400 (Tue, 15 Sep 2009) New Revision: 17594 Modified: trunk/hibernatetools/docs/reference/en/modules/ant.xml Log: https://jira.jboss.org/jira/browse/JBDS-862 -Added the info about Naming= Strategy supporting in JPA projects to 5.3.1. Standard Hibernate Configurat= ion section. Modified: trunk/hibernatetools/docs/reference/en/modules/ant.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/docs/reference/en/modules/ant.xml 2009-09-15 15:20= :28 UTC (rev 17593) +++ trunk/hibernatetools/docs/reference/en/modules/ant.xml 2009-09-15 15:34= :12 UTC (rev 17594) @@ -367,7 +367,7 @@ Name of a class that implements org.hibernate.cfg.Na= mingStrategy. Used for setting up the naming strategy in Hibernate which contro= ls the automatic naming of - tables and columns. + tables and columns.In JPA projects naming strategy is su= pported for default Name/Columns mapping = --===============4067013169629213722==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:38:30 2009 Content-Type: multipart/mixed; boundary="===============0649383377668826566==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17595 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project. Date: Tue, 15 Sep 2009 11:38:30 -0400 Message-ID: <200909151538.n8FFcUl8002937@svn01.web.mwc.hst.phx2.redhat.com> --===============0649383377668826566== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 11:38:29 -0400 (Tue, 15 Sep 2009) New Revision: 17595 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/project/ProjectHome.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/project/ProjectHome.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ProjectHome.java 2009-09-15 15:34:12 UTC (rev 17594) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ProjectHome.java 2009-09-15 15:38:29 UTC (rev 17595) @@ -48,15 +48,15 @@ File f =3D new File(location + XModelObjectConstants.SEPARATOR + IModelN= ature.PROJECT_TEMP); File ep =3D new File(location + XModelObjectConstants.SEPARATOR + IModel= Nature.PROJECT_FILE); if(ep.isFile()) { - // to remove .struts file = + // to remove temp file = if(f.isFile()) f.delete(); - return getLocationFrom_strutsstudio_File(location, ep); + return getLocationFrom_project_File(location, ep); } - if(f.isFile()) return getLocationFrom_struts_File(location, f); + if(f.isFile()) return getLocationFrom_temp_File(location, f); return ""; //$NON-NLS-1$ } = - private String getLocationFrom_strutsstudio_File(String location, File ss= ) { + private String getLocationFrom_project_File(String location, File ss) { Element element =3D XMLUtil.getElement(ss); String path =3D ""; //$NON-NLS-1$ if(element.hasAttribute("workspace-home")) { //$NON-NLS-1$ @@ -68,7 +68,7 @@ return q; } = - private String getLocationFrom_struts_File(String location, File s) { + private String getLocationFrom_temp_File(String location, File s) { String path =3D XModelObjectLoaderUtil.getCDATA(XMLUtil.getElement(s)); String q =3D (path.equals(".")) ? location : (path.startsWith("./")) ? l= ocation + path.substring(1) : path; //$NON-NLS-1$ //$NON-NLS-2$ s.delete(); --===============0649383377668826566==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:43:26 2009 Content-Type: multipart/mixed; boundary="===============4750361253310944684==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17596 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page. Date: Tue, 15 Sep 2009 11:43:26 -0400 Message-ID: <200909151543.n8FFhQ8a004396@svn01.web.mwc.hst.phx2.redhat.com> --===============4750361253310944684== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 11:43:25 -0400 (Tue, 15 Sep 2009) New Revision: 17596 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/m= odel/handlers/page/RunHandler.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Dead code removed Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/s= truts/model/handlers/page/RunHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/= model/handlers/page/RunHandler.java 2009-09-15 15:38:29 UTC (rev 17595) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/= model/handlers/page/RunHandler.java 2009-09-15 15:43:25 UTC (rev 17596) @@ -79,9 +79,4 @@ } } = - public static void startExplorer(XModel model, String url) throws Excepti= on { - BrowserHelper.startExplorer(model, url); - } - - } --===============4750361253310944684==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:44:21 2009 Content-Type: multipart/mixed; boundary="===============1676574000863768161==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17597 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util. Date: Tue, 15 Sep 2009 11:44:21 -0400 Message-ID: <200909151544.n8FFiLcs004489@svn01.web.mwc.hst.phx2.redhat.com> --===============1676574000863768161== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-15 11:44:21 -0400 (Tue, 15 Sep 2009) New Revision: 17597 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/util/BrowserHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4885 Dead code removed Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/common/model/util/BrowserHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/BrowserHelper.java 2009-09-15 15:43:25 UTC (rev 17596) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/BrowserHelper.java 2009-09-15 15:44:21 UTC (rev 17597) @@ -1,107 +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.model.util; - -import java.io.*; -import java.text.MessageFormat; -import java.util.*; -import org.jboss.tools.common.model.*; -import org.jboss.tools.common.model.engines.impl.XProcess; -import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.model.plugin.ModelMessages; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.meta.action.*; -import org.jboss.tools.common.meta.action.impl.*; -import org.jboss.tools.common.meta.action.impl.handlers.*; - -public class BrowserHelper { - static String ATTRIBUTE =3D "Browser Path"; //$NON-NLS-1$ - = - - public BrowserHelper() {} - - public static void startExplorer(XModel model, String url) throws XModelE= xception { - XModelObject editor =3D PreferenceModelUtilities.getPreferenceModel().ge= tByPath("%Options%/Struts Studio/Running"); //$NON-NLS-1$ - if(editor =3D=3D null) throw new XModelException(ModelMessages.BrowserHe= lper_InternetBrowserNotSet); - if(validatePath(PreferenceModelUtilities.getPreferenceModel().getService= (), editor)) new OWEProcess(editor, url).start(); - } - = - static boolean validatePath(ServiceDialog d, XModelObject o) { - String[] paths =3D getEnvironmentPaths(); - String en =3D o.getModelEntity().getName(); - XEntityData[] dt =3D new XEntityData[]{XEntityDataImpl.create(new String= [][]{{en, XModelObjectConstants.YES}, {ATTRIBUTE, XModelObjectConstants.YES= }})}; - String path =3D o.getAttributeValue(ATTRIBUTE).replace('\\','/'); - XAttributeData ad =3D HUtil.find(dt, 0, ATTRIBUTE); - ad.setValue(path); - while(true) { - String b =3D ad.getValue(); - if(b !=3D null && b.length() > 0) - try { - if(fileExists(b, paths)) { - if(!b.equals(path)) { - o.getModel().changeObjectAttribute(o, ATTRIBUTE, b); - o.getModel().saveOptions(); - } - return true; - } - } catch (XModelException e) { - ModelPlugin.getPluginLog().logError("BrowserHelper:" + e.getMessage(= )); //$NON-NLS-1$ - } - int i =3D d.showDialog(ModelMessages.BrowserHelper_DialogTitleRun, Mess= ageFormat.format(ModelMessages.BrowserHelper_EnterValidPath, o.getPresentat= ionString()), - new String[]{ModelMessages.OK, ModelMessages.Cancel}, dt[0], Serv= iceDialog.QUESTION); - if(i !=3D 0) return false; - } - } - - static String[] getEnvironmentPaths() { - String jlp =3D OSHelper.getProperty("PATH", ""); //$NON-NLS-1$ //$NON-N= LS-2$ - StringTokenizer st =3D new StringTokenizer(jlp, File.pathSeparator); - String[] ps =3D new String[st.countTokens()]; - for (int i =3D 0; i < ps.length; i++) ps[i] =3D st.nextToken(); - return ps; - } - - static boolean fileExists(String filename, String[] paths) { - filename =3D filename.replace('\\', '/'); - if(paths =3D=3D null || filename.indexOf('/') >=3D 0) return new File(fi= lename).isFile(); - for (int i =3D 0; i < paths.length; i++) { - String f =3D paths[i] + XModelObjectConstants.SEPARATOR + filename; - if(new File(f).isFile()) return true; - } - return false; - } - -} - -class OWEProcess extends XProcess { - private XModelObject o; - private String url; - - public OWEProcess(XModelObject o, String url) { - this.o =3D o; - this.url =3D url; - } - - protected String getRoot() { - return "."; //$NON-NLS-1$ - } - - protected void write(String s) { - o.getModel().getOut().print(s); - } - - protected void buildCommandLine(ArrayList l) { - String program =3D o.getAttributeValue(BrowserHelper.ATTRIBUTE); - l.add(program); - l.add(url); - } - -} --===============1676574000863768161==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 11:57:03 2009 Content-Type: multipart/mixed; boundary="===============6502107012726180427==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17598 - in trunk/jst/plugins: org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common and 1 other directory. Date: Tue, 15 Sep 2009 11:57:03 -0400 Message-ID: <200909151557.n8FFv30B006726@svn01.web.mwc.hst.phx2.redhat.com> --===============6502107012726180427== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: sdzmitrovich Date: 2009-09-15 11:57:03 -0400 (Tue, 15 Sep 2009) New Revision: 17598 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleRuleContainer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/common/StyleAttributes.java Log: JBIDE-4850 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/common/CSSStyleRuleContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java 2009-09-15 15:44:21 UTC (rev 17597) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java 2009-09-15 15:57:03 UTC (rev 17598) @@ -44,7 +44,8 @@ if ((me.getValue() =3D=3D null) || (me.getValue().length() =3D=3D 0)) { declaration.removeProperty(me.getKey()); - } else { + } else if (!me.getValue().equals( + declaration.getPropertyValue(me.getKey()))) { declaration.setProperty(me.getKey(), me.getValue(), Constants.EMPTY); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/common/StyleAttributes.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/StyleAttributes.java 2009-09-15 15:44:21 UTC (rev 1= 7597) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/StyleAttributes.java 2009-09-15 15:57:03 UTC (rev 1= 7598) @@ -21,96 +21,101 @@ */ public class StyleAttributes { = - private Map attributeMap =3D null; - /** - * Default constructor. - */ - public StyleAttributes() { - this.attributeMap =3D new WritableMap(); - } + private Map attributeMap =3D null; = - /** - * Gets attribute map. - * - * @return map of attributes - */ - public Map getAttributeMap() { - return attributeMap; - } + /** + * Default constructor. + */ + public StyleAttributes() { + this.attributeMap =3D new WritableMap(); + } = + /** + * Gets attribute map. + * = + * @return map of attributes + */ + public Map getAttributeMap() { + return attributeMap; + } = + /** + * Add attribute with the given name and value. + * = + * @param name + * the name of attribute + * @param value + * the value of attribute + */ + public void addAttribute(String name, String value) { + attributeMap.put(name, value); + } = - /** - * Add attribute with the given name and value. - * - * @param name the name of attribute - * @param value the value of attribute - */ - public void addAttribute(String name, String value) { - attributeMap.put(name, value); - } + /** + * Remove attribute with the given name. + * = + * @param name + * the name of attribute to be removed + */ + public void removeAttribute(String name) { + attributeMap.remove(name); + } = - /** - * Remove attribute with the given name. - * - * @param name the name of attribute to be removed - */ - public void removeAttribute(String name) { - attributeMap.remove(name); - } + /** + * @see java.util.HashMap#entrySet() + */ + public Set> entrySet() { + return attributeMap.entrySet(); + } = - /** - * @see java.util.HashMap#entrySet() - */ - public Set> entrySet() { - return attributeMap.entrySet(); - } + /** + * Get attribute value with the given name. + * = + * @param name + * the name of attribute to be returned + * @return attribute value + */ + public String getAttribute(String name) { + String value =3D attributeMap.get(name); + return value !=3D null ? value : Constants.EMPTY; + } = - /** - * Get attribute value with the given name. - * - * @param name the name of attribute to be returned - * @return attribute value - */ - public String getAttribute(String name) { - String value =3D attributeMap.get(name); - return value !=3D null ? value : Constants.EMPTY; - } + /** + * @see java.util.HashMap#keySet() + */ + public Set keySet() { + return attributeMap.keySet(); + } = - /** - * @see java.util.HashMap#keySet() - */ - public Set keySet() { - return attributeMap.keySet(); - } + /** + * Clear cache of attributes. + */ + public void clear() { + attributeMap.clear(); + } = - /** - * Clear cache of attributes. - */ - public void clear() { - attributeMap.clear(); - } - = - /** + /** * = */ - public void setStyleProperties(Map properties){ - attributeMap.clear(); - attributeMap.putAll(properties); - } - = + public void setStyleProperties(Map properties) { + attributeMap.clear(); + attributeMap.putAll(properties); + } + /** * String representation of style attributes. - * + * = * @return style string representation */ public String getStyle() { - // update newStyle value - StringBuffer buf =3D new StringBuffer(); - Set> set =3D entrySet(); - for (Map.Entry me : set) { - buf.append(me.getKey() + Constants.COLON + me.getValue() + Con= stants.SEMICOLON); - } - return buf.toString(); + // update newStyle value + StringBuffer buf =3D new StringBuffer(); + Set> set =3D entrySet(); + for (Map.Entry me : set) { + if ((me.getValue() !=3D null) && (me.getValue().length() !=3D 0)) + buf.append(me.getKey() + Constants.COLON + me.getValue() + + Constants.SEMICOLON); + } + return buf.toString(); } } --===============6502107012726180427==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 16:00:40 2009 Content-Type: multipart/mixed; boundary="===============4428805599888596759==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17599 - trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/tools/bpel/as/integration. Date: Tue, 15 Sep 2009 16:00:40 -0400 Message-ID: <200909152000.n8FK0ebA022343@svn01.web.mwc.hst.phx2.redhat.com> --===============4428805599888596759== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 16:00:39 -0400 (Tue, 15 Sep 2009) New Revision: 17599 Added: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/too= ls/bpel/as/integration/Activator.java trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/too= ls/bpel/as/integration/JBossServerBPELPublisher.java Log: restore bpel.as.integration java classes to fix plugin activation errors Added: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss= /tools/bpel/as/integration/Activator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/to= ols/bpel/as/integration/Activator.java (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/to= ols/bpel/as/integration/Activator.java 2009-09-15 20:00:39 UTC (rev 17599) @@ -0,0 +1,50 @@ +package org.jboss.tools.bpel.as.integration; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID =3D "org.jboss.tools.bpel.as.integra= tion"; + + // The shared instance + private static Activator plugin; + = + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.B= undleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin =3D this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.Bu= ndleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin =3D null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Property changes on: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration= /src/org/jboss/tools/bpel/as/integration/Activator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss= /tools/bpel/as/integration/JBossServerBPELPublisher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/to= ols/bpel/as/integration/JBossServerBPELPublisher.java = (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/src/org/jboss/to= ols/bpel/as/integration/JBossServerBPELPublisher.java 2009-09-15 20:00:39 U= TC (rev 17599) @@ -0,0 +1,37 @@ +package org.jboss.tools.bpel.as.integration; + +import org.eclipse.bpel.runtimes.IBPELModuleFacetConstants; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.publishers.JstPublisher; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; + +public class JBossServerBPELPublisher extends JstPublisher implements + IJBossServerPublisher { + + public JBossServerBPELPublisher() { + } + + public boolean accepts(String method, IServer server, IModule[] module) { + return "local".equals(method) && accepts(server, module); + } + = + public boolean accepts(IServer server, IModule[] module) { + IProject project =3D module[0].getProject(); + if(project =3D=3D null) return false; + = + try { + IFacetedProject fp =3D ProjectFacetsManager.create(project); + IProjectFacet pf =3D ProjectFacetsManager.getProjectFacet(IBPELModuleFa= cetConstants.BPEL20_PROJECT_FACET); + return fp.hasProjectFacet(pf); + } catch (Exception e) { + return false; + } + = + } +} Property changes on: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration= /src/org/jboss/tools/bpel/as/integration/JBossServerBPELPublisher.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============4428805599888596759==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 16:05:02 2009 Content-Type: multipart/mixed; boundary="===============6496744529473787445==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17600 - trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF. Date: Tue, 15 Sep 2009 16:05:02 -0400 Message-ID: <200909152005.n8FK52sC023099@svn01.web.mwc.hst.phx2.redhat.com> --===============6496744529473787445== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 16:05:02 -0400 (Tue, 15 Sep 2009) New Revision: 17600 Modified: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST= .MF Log: restore bpel.as.integration java classes to fix plugin activation errors Modified: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/M= ANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFES= T.MF 2009-09-15 20:00:39 UTC (rev 17599) +++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFES= T.MF 2009-09-15 20:05:02 UTC (rev 17600) @@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName +Export-Package: org.jboss.tools.bpel.as.integration --===============6496744529473787445==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 16:34:26 2009 Content-Type: multipart/mixed; boundary="===============6589615844527371284==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17601 - trunk/maven/features/org.jboss.tools.maven.feature. Date: Tue, 15 Sep 2009 16:34:26 -0400 Message-ID: <200909152034.n8FKYQJn029093@svn01.web.mwc.hst.phx2.redhat.com> --===============6589615844527371284== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 16:34:26 -0400 (Tue, 15 Sep 2009) New Revision: 17601 Modified: trunk/maven/features/org.jboss.tools.maven.feature/.project Log: correct project name for maven.sdk.feature Modified: trunk/maven/features/org.jboss.tools.maven.feature/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/features/org.jboss.tools.maven.feature/.project 2009-09-15 = 20:05:02 UTC (rev 17600) +++ trunk/maven/features/org.jboss.tools.maven.feature/.project 2009-09-15 = 20:34:26 UTC (rev 17601) @@ -1,6 +1,6 @@ - org.jboss.tools.maven.feature + org.jboss.tools.maven.sdk.feature --===============6589615844527371284==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 19:34:00 2009 Content-Type: multipart/mixed; boundary="===============7517259607613601066==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17602 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory. Date: Tue, 15 Sep 2009 19:34:00 -0400 Message-ID: <200909152334.n8FNY0ib031727@svn01.web.mwc.hst.phx2.redhat.com> --===============7517259607613601066== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 19:34:00 -0400 (Tue, 15 Sep 2009) New Revision: 17602 Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/valid= ator/factory/AdapterFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4890 NPE was fixed Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpe= l/validator/factory/AdapterFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/factory/AdapterFactory.java 2009-09-15 20:34:26 UTC (rev 17601) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/factory/AdapterFactory.java 2009-09-15 23:34:00 UTC (rev 17602) @@ -132,11 +132,15 @@ IResource adapt_Element2IResource ( Element elm ) { = Element top =3D elm.getOwnerDocument().getDocumentElement(); - = - // Find the EObject reference to the emf model in the hierarchy of the = - EObject eObj =3D (EObject) top.getUserData("emf.model"); - = - return adapt_EObject2IResource(eObj); + IResource result =3D null; + if (top !=3D null) { + // Find the EObject reference to the emf model in the hierarchy of + // the + EObject eObj =3D (EObject) top.getUserData("emf.model"); + + result =3D adapt_EObject2IResource(eObj); + } + return result; } = /** --===============7517259607613601066==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 21:02:20 2009 Content-Type: multipart/mixed; boundary="===============2427082154555355126==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17603 - in trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject: .settings and 1 other directory. Date: Tue, 15 Sep 2009 21:02:19 -0400 Message-ID: <200909160102.n8G12JiI016856@svn01.web.mwc.hst.phx2.redhat.com> --===============2427082154555355126== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 21:02:19 -0400 (Tue, 15 Sep 2009) New Revision: 17603 Removed: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperli= nksTestProject/.settings/.jsdtscope trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperli= nksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperli= nksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperli= nksTestProject/.settings/org.eclipse.wst.validation.prefs Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperli= nksTestProject/.project Log: test project for common.text.ext.test was cleaned up to make tests faster Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/= HiperlinksTestProject/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.project 2009-09-15 23:34:00 UTC (rev 17602) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.project 2009-09-16 01:02:19 UTC (rev 17603) @@ -21,7 +21,6 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature org.jboss.tools.jsf.jsfnature Deleted: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/H= iperlinksTestProject/.settings/.jsdtscope =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/.jsdtscope 2009-09-15 23:34:00 UTC (rev 17602) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/.jsdtscope 2009-09-16 01:02:19 UTC (rev 17603) @@ -1,11 +0,0 @@ - - - - - - - - - - - Deleted: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/H= iperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-= 09-15 23:34:00 UTC (rev 17602) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-= 09-16 01:02:19 UTC (rev 17603) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/H= iperlinksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-09-15= 23:34:00 UTC (rev 17602) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-09-16= 01:02:19 UTC (rev 17603) @@ -1 +0,0 @@ -Window \ No newline at end of file Deleted: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/H= iperlinksTestProject/.settings/org.eclipse.wst.validation.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/org.eclipse.wst.validation.prefs 2009-09-15 23:34= :00 UTC (rev 17602) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/Hiperl= inksTestProject/.settings/org.eclipse.wst.validation.prefs 2009-09-16 01:02= :19 UTC (rev 17603) @@ -1,9 +0,0 @@ -#Thu Oct 02 16:44:50 PDT 2008 -DELEGATES_PREFERENCE=3DdelegateValidatorList -USER_BUILD_PREFERENCE=3DenabledBuildValidatorListorg.eclipse.wst.common.co= mponentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.WS= IMessageValidator;org.jboss.tools.seam.internal.core.validation.SeamProject= PropertyValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidat= or;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator; -USER_MANUAL_PREFERENCE=3DenabledManualValidatorListorg.eclipse.wst.common.= componentcore.internal.ModuleCoreValidator;org.eclipse.wst.wsi.ui.internal.= WSIMessageValidator;org.jboss.tools.seam.internal.core.validation.SeamProje= ctPropertyValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValid= ator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidato= r; -USER_PREFERENCE=3DoverrideGlobalPreferencesfalse -eclipse.preferences.version=3D1 -override=3Dfalse -suspend=3Dfalse -vf.version=3D3 --===============2427082154555355126==-- From jbosstools-commits at lists.jboss.org Tue Sep 15 21:06:57 2009 Content-Type: multipart/mixed; boundary="===============7024290868327426590==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17604 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions. Date: Tue, 15 Sep 2009 21:06:57 -0400 Message-ID: <200909160106.n8G16vRg017887@svn01.web.mwc.hst.phx2.redhat.com> --===============7024290868327426590== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-15 21:06:57 -0400 (Tue, 15 Sep 2009) New Revision: 17604 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java Log: exception handling was cleaned up in o.j.t.hibernate.ui.diagram.editors.act= ions Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-09-= 16 01:02:19 UTC (rev 17603) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-09-= 16 01:06:57 UTC (rev 17604) @@ -30,22 +30,16 @@ = protected DiagramViewer getDiagramViewer() { DiagramViewer res =3D editor; - if (res =3D=3D null && PlatformUI.getWorkbench() !=3D null && = - PlatformUI.getWorkbench().getActiveWorkbenchWindow() !=3D null && - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != =3D null && - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().g= etActivePart() !=3D null) { - IWorkbenchPart part =3D PlatformUI.getWorkbench().getActiveWorkbenchWin= dow().getActivePage().getActivePart(); - if (part instanceof DiagramViewer) { - res =3D (DiagramViewer)part; - } else if (part instanceof ContentOutline) { - ContentOutline co =3D (ContentOutline)part; - if (co.getCurrentPage() instanceof DiagramContentOutlinePage) { - DiagramContentOutlinePage dcop =3D (DiagramContentOutlinePage)co.getC= urrentPage(); - res =3D dcop.getEditor(); - } + IWorkbenchPart part =3D PlatformUI.getWorkbench().getActiveWorkbenchWind= ow().getActivePage().getActivePart(); + if (part instanceof DiagramViewer) { + res =3D (DiagramViewer)part; + } else if (part instanceof ContentOutline) { + ContentOutline co =3D (ContentOutline)part; + if (co.getCurrentPage() instanceof DiagramContentOutlinePage) { + DiagramContentOutlinePage dcop =3D (DiagramContentOutlinePage)co.getCu= rrentPage(); + res =3D dcop.getEditor(); } } return res; } - } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-09-= 16 01:02:19 UTC (rev 17603) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-09-= 16 01:06:57 UTC (rev 17604) @@ -96,7 +96,7 @@ outStream =3D new FileOutputStream(filePath); outStream.write(imageData); outStream.flush(); - } catch (Exception e) { + } catch (IOException e) { HibernateConsolePlugin.getDefault().logErrorMessage("ExportImageAction"= , e); //$NON-NLS-1$ if (showErrDialog) { MessageDialog.openInformation(getDiagramViewer().getSite().getShell(), @@ -123,7 +123,7 @@ * SWT.IMAGE_ICO, SWT.IMAGE_JPEG, or SWT.IMAGE_PNG * @return the bytes of an encoded image for the specified Figure */ - private byte[] createImage(IFigure figure, int format) throws Exception { + private byte[] createImage(IFigure figure, int format) { = Device device =3D getDiagramViewer().getEditPartViewer().getControl() .getDisplay(); @@ -134,7 +134,6 @@ Image image =3D null; GC gc =3D null; Graphics g =3D null; - Exception error =3D null; try { image =3D new Image(device, r.width, r.height); gc =3D new GC(image); @@ -146,8 +145,6 @@ ImageLoader imageLoader =3D new ImageLoader(); imageLoader.data =3D new ImageData[] { image.getImageData() }; imageLoader.save(result, format); - } catch (Exception ex) { - error =3D ex; } finally { if (g !=3D null) { g.dispose(); @@ -159,9 +156,6 @@ image.dispose(); } } - if (error !=3D null) { - throw error; - } return result.toByteArray(); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-09-= 16 01:02:19 UTC (rev 17603) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-09-= 16 01:06:57 UTC (rev 17604) @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.Set; = +import org.eclipse.core.runtime.CoreException; import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.resource.ImageDescriptor; @@ -66,10 +67,8 @@ Property parentProperty =3D ((SpecialRootClass)compositSel.getPersiste= ntClass()).getProperty(); try { editorPart =3D org.hibernate.eclipse.console.actions.OpenMappingActio= n.run(consoleConfig, compositSel, parentProperty); - } catch (PartInitException e) { + } catch (CoreException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMess= ages.OpenMappingAction_canot_find_or_open_mapping_file, e); - } catch (JavaModelException e) { - HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMess= ages.OpenMappingAction_canot_find_or_open_mapping_file, e); } catch (FileNotFoundException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMess= ages.OpenMappingAction_canot_find_or_open_mapping_file, e); } @@ -86,10 +85,8 @@ } try { editorPart =3D org.hibernate.eclipse.console.actions.OpenMappingAction= .run(consoleConfig, selection, selectionParent); - } catch (PartInitException e) { + } catch (CoreException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessa= ges.OpenMappingAction_open_mapping_file, e); - } catch (JavaModelException e) { - HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessa= ges.OpenMappingAction_open_mapping_file, e); } catch (FileNotFoundException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessa= ges.OpenMappingAction_open_mapping_file, e); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-09-1= 6 01:02:19 UTC (rev 17603) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-09-1= 6 01:06:57 UTC (rev 17604) @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.Set; = +import org.eclipse.core.runtime.CoreException; import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.resource.ImageDescriptor; @@ -93,10 +94,8 @@ }*/ try { editorPart =3D org.hibernate.eclipse.console.actions.OpenSourceAction.= run(consoleConfig, selection, fullyQualifiedName); - } catch (PartInitException e) { + } catch (CoreException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessa= ges.OpenSourceAction_canot_open_source_file, e); - } catch (JavaModelException e) { - HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessa= ges.OpenSourceAction_canot_find_source_file, e); } catch (FileNotFoundException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessa= ges.OpenSourceAction_canot_find_source_file, e); } --===============7024290868327426590==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 02:09:18 2009 Content-Type: multipart/mixed; boundary="===============4259070632400289917==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17605 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/WebContent/WEB-INF/lib. Date: Wed, 16 Sep 2009 02:09:18 -0400 Message-ID: <200909160609.n8G69I8O011331@svn01.web.mwc.hst.phx2.redhat.com> --===============4259070632400289917== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-16 02:09:18 -0400 (Wed, 16 Sep 2009) New Revision: 17605 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3247/Web= Content/WEB-INF/lib/jsf-facelets.jar Log: fix JUnit test error in JsfAllTests.testOpenOnForJavaElementFromDeclaration= InJar Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE3= 247/WebContent/WEB-INF/lib/jsf-facelets.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============4259070632400289917==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 02:45:27 2009 Content-Type: multipart/mixed; boundary="===============4842103149607102814==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17606 - in trunk: common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver and 10 other directories. Date: Wed, 16 Sep 2009 02:45:27 -0400 Message-ID: <200909160645.n8G6jRxV016809@svn01.web.mwc.hst.phx2.redhat.com> --===============4842103149607102814== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-16 02:45:26 -0400 (Wed, 16 Sep 2009) New Revision: 17606 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/IVariable.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberELSegment.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/el/ContextVariableELSegment.java Removed: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELOperandResolveStatus.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolver2.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/el/SeamELOperandResolveStatus.java Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELCompletionEngine.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolution.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolutionImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolver.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELSegment.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELSegmentImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberELSegmentImpl.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFE= LCompletionEngine.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFI= mplicitObjectELResolver.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFM= essageELCompletionEngine.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/XmlContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/PageProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/el/AbstractELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/co= re/ISeamContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/el/SeamELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/el/SeamExpressionResolver.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/el/SeamPromptingProvider.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/validation/SeamELValidator.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/t= ext/java/SeamELProposalProcessor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/v= iews/properties/SeamELAttributeContentProposalProvider.java trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANI= FEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.M= F 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.M= F 2009-09-16 06:45:26 UTC (rev 17606) @@ -9,7 +9,9 @@ Export-Package: org.jboss.tools.common.el.core, org.jboss.tools.common.el.core.model, org.jboss.tools.common.el.core.parser, - org.jboss.tools.common.el.core.resolver + org.jboss.tools.common.el.core.resolver, + org.jboss.tools.common.el.internal.core.parser, + org.jboss.tools.common.el.internal.core.parser.token Bundle-Activator: org.jboss.tools.common.el.core.Activator Require-Bundle: org.eclipse.jface.text, org.eclipse.wst.sse.core, Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELCompletionEngine.java 2009-09-16 06:09:18 UTC (r= ev 17605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELCompletionEngine.java 2009-09-16 06:45:26 UTC (r= ev 17606) @@ -19,8 +19,8 @@ = public interface ELCompletionEngine { = - public ELOperandResolveStatus resolveELOperand(IFile file, ELExpression o= perand, = + public ELResolution resolveELOperand(IFile file, ELExpression operand, = boolean returnEqualedVariablesOnly, Listvars, ElVarSearcher varSe= archer) throws BadLocationException, StringIndexOutOfBoundsException; = public ELParserFactory getParserFactory(); -} +} \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/= tools/common/el/core/resolver/ELOperandResolveStatus.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELOperandResolveStatus.java 2009-09-16 06:09:18 UT= C (rev 17605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELOperandResolveStatus.java 2009-09-16 06:45:26 UT= C (rev 17606) @@ -1,166 +0,0 @@ -/*************************************************************************= ****** = - * Copyright (c) 2007 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.common.el.core.resolver; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.jboss.tools.common.el.core.model.ELInvocationExpression; -import org.jboss.tools.common.text.TextProposal; - -/** - * Status of EL resolving. - * @author Jeremy - */ -public class ELOperandResolveStatus { - private ELInvocationExpression tokens; - Map unpairedGettersOrSetters; - Set proposals; - private ELInvocationExpression lastResolvedToken; - private boolean isMapOrCollectionOrBundleAmoungTheTokens =3D false; - private TypeInfoCollector.MemberInfo memberOfResolvedOperand; - - /** - * @return MemberInfo of last segment of EL operand. Null if El is not re= solved. - */ - public TypeInfoCollector.MemberInfo getMemberOfResolvedOperand() { - return memberOfResolvedOperand; - } - - /** - * Sets MemberInfo for last segment of EL operand. - * @param lastResolvedMember - */ - public void setMemberOfResolvedOperand( - TypeInfoCollector.MemberInfo lastResolvedMember) { - this.memberOfResolvedOperand =3D lastResolvedMember; - } - - /** - * Constructor - * @param tokens Tokens of EL - */ - public ELOperandResolveStatus(ELInvocationExpression tokens) { - this.tokens =3D tokens; - } - - /** - * @return true if EL contains any not parametrized Collection or Resourc= eBundle. - */ - public boolean isMapOrCollectionOrBundleAmoungTheTokens() { - return this.isMapOrCollectionOrBundleAmoungTheTokens; - } - - public void setMapOrCollectionOrBundleAmoungTheTokens() { - this.isMapOrCollectionOrBundleAmoungTheTokens =3D true; - } - - /** - * @return true if EL is resolved. - */ - public boolean isOK() { - return !getProposals().isEmpty() || isMapOrCollectionOrBundleAmoungTheTo= kens(); = - } - - /** - * @return false if El is not resolved. - */ - public boolean isError() { - return !isOK(); - } - - /** - * @return List of resolved tokens of EL. Includes separators "." - */ - public ELInvocationExpression getResolvedTokens() { - return lastResolvedToken; - } - - /** - * @return List of unresolved tokens of EL. - */ - public ELInvocationExpression getUnresolvedTokens() { - if(lastResolvedToken =3D=3D tokens) return null; - if(lastResolvedToken !=3D null && (lastResolvedToken.getParent() instanc= eof ELInvocationExpression)) { - return (ELInvocationExpression)lastResolvedToken.getParent(); - } - ELInvocationExpression l =3D tokens; - while(l !=3D null && l.getLeft() !=3D lastResolvedToken) { - l =3D l.getLeft(); - } - return l; - } - - /** - * @return Last resolved token of EL. Can be separator "." // no, change= it - */ - public ELInvocationExpression getLastResolvedToken() { - return lastResolvedToken; - } - - /** - * @param lastResolvedToken Last resolved token of EL. Can be separator "= ." - */ - public void setLastResolvedToken(ELInvocationExpression lastResolvedToken= ) { - this.lastResolvedToken =3D lastResolvedToken; - } - - /** - * @return Tokens of EL. - */ - public ELInvocationExpression getTokens() { - return tokens; - } - - /** - * @param tokens Tokens of EL. - */ - public void setTokens(ELInvocationExpression tokens) { - this.tokens =3D tokens; - } - - /** - * = - * @return Set of proposals for EL - */ - public Set getProposals() { - return proposals =3D=3D null ? new TreeSet() : proposals; - } - - /** - * @param proposals Set of TextProposal proposals. - */ - public void setProposals(Set proposals) { - this.proposals =3D proposals; - } - - /** - * @return Map of unpaired getters and setters (getters/setters without p= roper setters/getters). - * of all properties used in EL. - * Key - name of property. - * Value - MethodInfo of existed getter/setter. - */ - public Map getUnpairedGettersOrSett= ers() { - if (unpairedGettersOrSetters =3D=3D null) { - unpairedGettersOrSetters =3D new HashMap(); - } - return unpairedGettersOrSetters; - } - - /** - * Clear Map of unpaired getters and setters. - */ - public void clearUnpairedGettersOrSetters() { - getUnpairedGettersOrSetters().clear(); - } -} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELResolution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolution.java 2009-09-16 06:09:18 UTC (rev 176= 05) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolution.java 2009-09-16 06:45:26 UTC (rev 176= 06) @@ -58,5 +58,10 @@ /** * @return true if there is any unresolved segment. */ - boolean hasUnresolvedSegment(); + boolean isResolved(); + + /** + * @return last segment. May return null. + */ + ELSegment getLastSegment(); } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELResolutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java 2009-09-16 06:09:18 UTC (rev= 17605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java 2009-09-16 06:45:26 UTC (rev= 17606) @@ -11,10 +11,14 @@ package org.jboss.tools.common.el.core.resolver; = import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; = import org.eclipse.jdt.core.IJavaElement; import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.text.TextProposal; = /** * @author Alexey Kazakov @@ -24,6 +28,9 @@ protected ELContext context; protected List segments =3D new ArrayList(); protected ELExpression operand; + protected Set proposals =3D new HashSet(); + protected ELInvocationExpression lastResolvedToken; + protected boolean mapOrCollectionOrBundleAmoungTheTokens; = /* (non-Javadoc) * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentB= yJavaElement(org.eclipse.jdt.core.IJavaElement) @@ -74,15 +81,107 @@ * @see org.jboss.tools.common.el.core.resolver.ELResolution#getUnresolve= dSegment() */ public ELSegment getUnresolvedSegment() { - // TODO + for (ELSegment segment : segments) { + if(!segment.isResolved()) { + return segment; + } + } return null; } = /* (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELResolution#hasUnresolve= dSegment() + * @see org.jboss.tools.common.el.core.resolver.ELResolution#isResolved() */ - public boolean hasUnresolvedSegment() { - // TODO - return false; + public boolean isResolved() { + return !segments.isEmpty() && getUnresolvedSegment()=3D=3Dnull; } + + /** + * @return the proposals + */ + public Set getProposals() { + return proposals; + } + + /** + * @param proposals the proposals to set + */ + public void setProposals(Set proposals) { + this.proposals =3D proposals; + } + + /** + * @param operand the operand to set + */ + public void setSourceOperand(ELExpression operand) { + this.operand =3D operand; + } + + /** + * @param context the context to set + */ + public void setContext(ELContext context) { + this.context =3D context; + } + + /** + * @param segments the segments to set + */ + public void setSegments(List segments) { + this.segments =3D segments; + } + + /** + * @return the lastResolvedToken + */ + public ELInvocationExpression getLastResolvedToken() { + return lastResolvedToken; + } + + /** + * @param lastResolvedToken the lastResolvedToken to set + */ + public void setLastResolvedToken(ELInvocationExpression lastResolvedToken= ) { + this.lastResolvedToken =3D lastResolvedToken; + } + + /** + * @return the operand + */ + public ELExpression getOperand() { + return operand; + } + + /** + * @param operand the operand to set + */ + public void setOperand(ELExpression operand) { + this.operand =3D operand; + } + + /** + * @return the mapOrCollectionOrBundleAmoungTheTokens + */ + public boolean isMapOrCollectionOrBundleAmoungTheTokens() { + return mapOrCollectionOrBundleAmoungTheTokens; + } + + /** + * @param mapOrCollectionOrBundleAmoungTheTokens the mapOrCollectionOrBun= dleAmoungTheTokens to set + */ + public void setMapOrCollectionOrBundleAmoungTheTokens( + boolean mapOrCollectionOrBundleAmoungTheTokens) { + this.mapOrCollectionOrBundleAmoungTheTokens =3D mapOrCollectionOrBundleA= moungTheTokens; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#getLastSegme= nt() + */ + public ELSegment getLastSegment() { + if(!getSegments().isEmpty()) { + return getSegments().get(getSegments().size()-1); + } + return null; + } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolver.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolver.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -16,25 +16,24 @@ import org.jboss.tools.common.text.TextProposal; = /** - * Represents EL Resolver + * Represents EL Resolver. + * TODO replace old ELResolver interface with this one. * @author Alexey Kazakov */ public interface ELResolver { = /** - * @param elString - * @param position * @param context - * @param returnEqualedVariablesOnly - * @return + * @param el + * @return proposal list */ - List getCompletions(String elString, boolean returnEqualedV= ariablesOnly, int position, ELContext context); + List getProposals(ELContext context, String el); = /** - * = - * @param operand + * Resolves EL operand. * @param context + * @param operand * @return */ - ELOperandResolveStatus resolveELOperand(ELExpression operand, ELContext c= ontext, boolean returnEqualedVariablesOnly); + ELResolution resolve(ELContext context, ELExpression operand); } \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/= tools/common/el/core/resolver/ELResolver2.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolver2.java 2009-09-16 06:09:18 UTC (rev 1760= 5) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolver2.java 2009-09-16 06:45:26 UTC (rev 1760= 6) @@ -1,39 +0,0 @@ -/*************************************************************************= ****** = - * 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.common.el.core.resolver; - -import java.util.List; - -import org.jboss.tools.common.el.core.model.ELExpression; -import org.jboss.tools.common.text.TextProposal; - -/** - * Represents EL Resolver. - * TODO replace old ELResolver interface with this one. - * @author Alexey Kazakov - */ -public interface ELResolver2 { - - /** - * @param context - * @param el - * @return proposal list - */ - List getProposals(ELContext context, String el); - - /** - * Resolves EL operand. - * @param context - * @param operand - * @return - */ - ELResolution resolve(ELContext context, ELExpression operand); -} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegment.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegment.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -10,8 +10,10 @@ *************************************************************************= *****/ = package org.jboss.tools.common.el.core.resolver; = +import java.util.List; + import org.eclipse.core.resources.IResource; -import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.model.project.ext.ITextSourceReference; = /** @@ -23,7 +25,7 @@ /** * @return source EL token. */ - ELInvocationExpression getToken(); + LexicalToken getToken(); = /** * @return true if the segment has been resolved. @@ -39,4 +41,9 @@ * @return source reference of underlying object. */ ITextSourceReference getSourceReference(); + + /** + * @return underlying variables. + */ + List getVariables(); } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELSegmentImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegmentImpl.java 2009-09-16 06:09:18 UTC (rev 17= 605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELSegmentImpl.java 2009-09-16 06:45:26 UTC (rev 17= 606) @@ -10,8 +10,11 @@ *************************************************************************= *****/ = package org.jboss.tools.common.el.core.resolver; = +import java.util.ArrayList; +import java.util.List; + import org.eclipse.core.resources.IResource; -import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.model.project.ext.ITextSourceReference; = /** @@ -21,8 +24,9 @@ = protected IResource resource; protected ITextSourceReference sourceReference; - protected ELInvocationExpression token; + protected LexicalToken token; protected boolean resolved =3D false; + protected List variables =3D new ArrayList(); = /* (non-Javadoc) * @see org.jboss.tools.common.el.core.resolver.ELSegment#getResource() @@ -41,7 +45,7 @@ /* (non-Javadoc) * @see org.jboss.tools.common.el.core.resolver.ELSegment#getToken() */ - public ELInvocationExpression getToken() { + public LexicalToken getToken() { return token; } = @@ -69,7 +73,7 @@ /** * @param token the token to set */ - public void setToken(ELInvocationExpression token) { + public void setToken(LexicalToken token) { this.token =3D token; } = @@ -79,4 +83,18 @@ public void setResolved(boolean resolved) { this.resolved =3D resolved; } + + /** + * @return the variables + */ + public List getVariables() { + return variables; + } + + /** + * @param variable the variables to set + */ + public void setVariables(List variables) { + this.variables =3D variables; + } } \ No newline at end of file Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/to= ols/common/el/core/resolver/IVariable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/IVariable.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/IVariable.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -0,0 +1,22 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +/** + * @author Alexey Kazakov + */ +public interface IVariable { + + /** + * @return name of the variable + */ + String getName(); +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/sr= c/org/jboss/tools/common/el/core/resolver/IVariable.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/t= ools/common/el/core/resolver/JavaMemberELSegment.java (from rev 17567, trun= k/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/= el/core/resolver/JavaMemberElSegment.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java (= rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java 2009-09-16 06:45:26 UTC (= rev 17606) @@ -0,0 +1,40 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +import org.eclipse.jdt.core.IJavaElement; + +/** + * Describes a segment of EL operand which is a Java Element. = + * @author Alexey Kazakov + */ +public interface JavaMemberELSegment extends ELSegment { + + /** + * @return member info object of resolved segment. May return null. + */ + TypeInfoCollector.MemberInfo getMemberInfo(); + + /** + * @return Java Element which represent this resolve segment. May return = null. = + */ + IJavaElement getJavaElement(); + + /** + * @return true if an underlying object is field and this field has gette= r. + */ + boolean hasGetter(); + + /** + * @return true if an underlying object is field and this field has sette= r. + */ + boolean hasSetter(); +} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/JavaMemberELSegmentImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegmentImpl.java 2009-09-16 06:09:18 U= TC (rev 17605) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegmentImpl.java 2009-09-16 06:45:26 U= TC (rev 17606) @@ -10,18 +10,22 @@ *************************************************************************= *****/ = package org.jboss.tools.common.el.core.resolver; = +import java.util.HashMap; +import java.util.Map; + import org.eclipse.jdt.core.IJavaElement; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInf= o; = /** * @author Alexey Kazakov */ -public class JavaMemberELSegmentImpl extends ELSegmentImpl implements Java= MemberElSegment { +public class JavaMemberELSegmentImpl extends ELSegmentImpl implements Java= MemberELSegment { = protected IJavaElement element; protected MemberInfo memberInfo; protected boolean hasSetter; protected boolean hasGetter; + protected Map unpairedGettersOrSett= ers; = /* (non-Javadoc) * @see org.jboss.tools.common.el.core.resolver.JavaMemberElSegment#getJa= vaElement() @@ -55,6 +59,9 @@ * @return the element */ public IJavaElement getElement() { + if(element=3D=3Dnull && memberInfo!=3Dnull) { + element =3D memberInfo.getJavaElement(); + } return element; } = @@ -99,4 +106,24 @@ public void setMemberInfo(MemberInfo memberInfo) { this.memberInfo =3D memberInfo; } + + /** + * @return Map of unpaired getters and setters (getters/setters without p= roper setters/getters). + * of all properties used in EL. + * Key - name of property. + * Value - MethodInfo of existed getter/setter. + */ + public Map getUnpairedGettersOrSett= ers() { + if (unpairedGettersOrSetters =3D=3D null) { + unpairedGettersOrSetters =3D new HashMap(); + } + return unpairedGettersOrSetters; + } + + /** + * Clear Map of unpaired getters and setters. + */ + public void clearUnpairedGettersOrSetters() { + getUnpairedGettersOrSetters().clear(); + } } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/mod= el/JSFELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= ELCompletionEngine.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= ELCompletionEngine.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -19,7 +19,7 @@ import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.el.core.parser.ELParserUtil; -import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus; +import org.jboss.tools.common.el.core.resolver.IVariable; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -65,15 +65,6 @@ = /* * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine#newELOpe= randResolveStatus(org.jboss.tools.common.el.core.model.ELInvocationExpressi= on) - */ - @Override - protected ELOperandResolveStatus newELOperandResolveStatus(ELInvocationEx= pression tokens) { - return new ELOperandResolveStatus(tokens); - } - - /* - * (non-Javadoc) * @see org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine#resolveV= ariables(org.eclipse.core.resources.IFile, org.jboss.tools.common.el.core.m= odel.ELInvocationExpression, boolean, boolean) */ public List resolveVariables(IFile file, ELInvocationExpres= sion expr, boolean isFinal, boolean onlyEqualNames) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/mod= el/JSFImplicitObjectELResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= ImplicitObjectELResolver.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= ImplicitObjectELResolver.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -28,6 +28,9 @@ import org.jboss.tools.common.el.core.model.ELModel; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELSegment; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -101,11 +104,17 @@ = for (String var : elVars) { try { - TypeInfoCollector.MemberInfo info =3D resolveEL(file, IMPLICT_OBJECTS_= ELS.get(var), false); - if(info!=3Dnull) { - IType type =3D info.getMemberType(); - if(type!=3Dnull) { - resolvedVariables.add(new Variable(var, type)); + ELResolution resolution =3D resolveEL(file, IMPLICT_OBJECTS_ELS.get(va= r), false); + if(resolution.isResolved()) { + ELSegment segment =3D resolution.getLastSegment(); + if(segment instanceof JavaMemberELSegment) { + TypeInfoCollector.MemberInfo info =3D ((JavaMemberELSegment)segment)= .getMemberInfo(); + if(info!=3Dnull) { + IType type =3D info.getMemberType(); + if(type!=3Dnull) { + resolvedVariables.add(new Variable(var, type)); + } + } } } } catch (StringIndexOutOfBoundsException e) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/mod= el/JSFMessageELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= MessageELCompletionEngine.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= MessageELCompletionEngine.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -32,8 +32,11 @@ import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.el.core.resolver.ELContext; -import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.ELSegmentImpl; +import org.jboss.tools.common.el.core.resolver.IVariable; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -62,8 +65,12 @@ JSFModelPlugin.getPluginLog().logError(e); } = - protected ELOperandResolveStatus newELOperandResolveStatus(ELInvocationEx= pression tokens) { - return new ELOperandResolveStatus(tokens); + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolver2#getProposals(= org.jboss.tools.common.el.core.resolver.ELContext, java.lang.String) + */ + public List getProposals(ELContext context, String el) { + return getCompletions(el, false, 0, context); } = public List getCompletions(String elString, @@ -87,30 +94,39 @@ return proposals; } = - public ELOperandResolveStatus resolveELOperand(ELExpression operand, + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolver2#resolve(org.j= boss.tools.common.el.core.resolver.ELContext, org.jboss.tools.common.el.cor= e.model.ELExpression) + */ + public ELResolution resolve(ELContext context, ELExpression operand) { + ELResolutionImpl resolution =3D resolveELOperand(operand, context, true); + resolution.setContext(context); + return resolution; + } + + public ELResolutionImpl resolveELOperand(ELExpression operand, ELContext context, boolean returnEqualedVariablesOnly) { - ELOperandResolveStatus status =3D null; IResourceBundle[] bundles =3D new IResourceBundle[0]; if(context instanceof IPageContext) { IPageContext pageContext =3D (IPageContext)context; bundles =3D pageContext.getResourceBundles(); } try { - status =3D resolveELOperand(context.getResource(), operand, returnEqual= edVariablesOnly, bundles); + return resolveELOperand(context.getResource(), operand, returnEqualedVa= riablesOnly, bundles); } catch (StringIndexOutOfBoundsException e) { log(e); } catch (BadLocationException e) { log(e); } - return status; + return null; } = public List getCompletions(IFile file, IDocument document, = CharSequence prefix, = int position, boolean returnEqualedVariablesOnly, IResourceBundle[] bun= dles) throws BadLocationException, StringIndexOutOfBoundsException { List completions =3D new ArrayList(); - = - ELOperandResolveStatus status =3D resolveELOperand(file, parseOperand(""= + prefix), returnEqualedVariablesOnly, bundles); //$NON-NLS-1$ - if (status.isOK()) { + + ELResolutionImpl status =3D resolveELOperand(file, parseOperand("" + pre= fix), returnEqualedVariablesOnly, bundles); //$NON-NLS-1$ + if (status.isResolved()) { completions.addAll(status.getProposals()); } = @@ -127,11 +143,11 @@ return is.get(0).getExpression(); } = - public ELOperandResolveStatus resolveELOperand(IFile file, + public ELResolutionImpl resolveELOperand(IFile file, ELExpression operand, boolean returnEqualedVariablesOnly, IResourceBund= le[] bundles) throws BadLocationException, StringIndexOutOfBoundsException { if(!(operand instanceof ELInvocationExpression) || file =3D=3D null) { - return newELOperandResolveStatus(null); + return null; } = ELInvocationExpression expr =3D (ELInvocationExpression)operand; @@ -139,7 +155,8 @@ && ((ELPropertyInvocation)expr).getName() =3D=3D null; boolean isArgument =3D expr.getType() =3D=3D ELObjectType.EL_ARGUMENT_IN= VOCATION; = - ELOperandResolveStatus status =3D newELOperandResolveStatus(expr); + ELResolutionImpl resolution =3D new ELResolutionImpl(); + resolution.setOperand(expr); ELInvocationExpression left =3D expr; = List resolvedVariables =3D new ArrayList(); @@ -161,14 +178,14 @@ returnEqualedVariablesOnly); if (resolvedVars !=3D null && !resolvedVars.isEmpty()) { resolvedVariables =3D resolvedVars; - status.setLastResolvedToken(left); + resolution.setLastResolvedToken(left); break; } left =3D (ELInvocationExpression)left.getLeft(); } = } = - if (status.getResolvedTokens() =3D=3D null && = + if (resolution.getLastResolvedToken() =3D=3D null && = !returnEqualedVariablesOnly && = expr !=3D null && = isIncomplete) { @@ -176,6 +193,12 @@ // the tokens are the part of var name ended with a separator (.) resolvedVariables =3D resolveVariables(file, expr, bundles, true, retur= nEqualedVariablesOnly); = Set proposals =3D new TreeSet(TextProposal.= KB_PROPOSAL_ORDER); + + ELSegmentImpl segment =3D new ELSegmentImpl(); + segment.setToken(expr.getFirstToken()); + segment.setResolved(false); + resolution.addSegment(segment); + for (Variable var : resolvedVariables) { String varName =3D var.getName(); if(varName.startsWith(operand.getText())) { @@ -185,15 +208,20 @@ proposals.add(proposal); } } - status.setProposals(proposals); - return status; + resolution.setProposals(proposals); + return resolution; } = // Here we have a list of vars for some part of expression // OK. we'll proceed with members of these vars - if (status.getResolvedTokens() =3D=3D status.getTokens()) { + if (resolution.getLastResolvedToken() =3D=3D operand) { // First segment is the last one Set proposals =3D new TreeSet(TextProposal.= KB_PROPOSAL_ORDER); + ELSegmentImpl segment =3D new ELSegmentImpl(); + segment.setToken(operand.getFirstToken()); + segment.setResolved(true); + resolution.addSegment(segment); + for (Variable var : resolvedVariables) { String varName =3D var.getName(); if(operand.getLength()<=3DvarName.length()) { @@ -207,24 +235,28 @@ setImage(proposal); proposals.add(proposal); } + segment.getVariables().add(var); } - status.setLastResolvedToken(expr); - status.setProposals(proposals); - return status; + resolution.setLastResolvedToken(expr); + resolution.setProposals(proposals); + return resolution; } = //process segments one by one if(left !=3D null) while(left !=3D expr) { left =3D (ELInvocationExpression)left.getParent(); if (left !=3D expr) { // inside expression - return status; + ELSegmentImpl segment =3D new ELSegmentImpl(); + segment.setResolved(false); + resolution.addSegment(segment); + return resolution; } else { // Last segment - resolveLastSegment((ELInvocationExpression)operand, resolvedVariables,= status, returnEqualedVariablesOnly); + resolveLastSegment((ELInvocationExpression)operand, resolvedVariables,= resolution, returnEqualedVariablesOnly); break; } } = - return status; + return resolution; } = public List resolveVariables(IFile file, ELInvocationExpression= expr, IResourceBundle[] bundles, boolean isFinal, boolean onlyEqualNames) { @@ -267,10 +299,19 @@ = protected void resolveLastSegment(ELInvocationExpression expr, = List members, - ELOperandResolveStatus status, + ELResolutionImpl resolution, boolean returnEqualedVariablesOnly) { Set kbProposals =3D new TreeSet(TextProposal= .KB_PROPOSAL_ORDER); - = + + ELSegmentImpl segment =3D new ELSegmentImpl(); + resolution.setProposals(kbProposals); + if(expr instanceof ELPropertyInvocation) { + segment.setToken(((ELPropertyInvocation)expr).getName()); = + } + if(segment.getToken()!=3Dnull) { + resolution.addSegment(segment); + } + if (expr.getType() =3D=3D ELObjectType.EL_PROPERTY_INVOCATION && ((ELPro= pertyInvocation)expr).getName() =3D=3D null) { // return all the methods + properties for (Variable mbr : members) { @@ -293,7 +334,7 @@ kbProposal.setReplacementString(proposal); = setImage(kbProposal); - = + kbProposals.add(kbProposal); = break; @@ -311,8 +352,8 @@ Set proposalsToFilter =3D new TreeSet(); boolean isMessages =3D false; for (Variable mbr : members) { - isMessages =3D true; - filterSingularMember(mbr, proposalsToFilter); + isMessages =3D true; + filterSingularMember(mbr, proposalsToFilter); } = String filter =3D expr.getMemberName(); @@ -329,20 +370,22 @@ filter =3D filter.substring(1); } else { //Value is set as expression itself, we cannot compute it - if(isMessages) status.setMapOrCollectionOrBundleAmoungTheTokens(); + if(isMessages) { + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); + } return; } } - = + for (String proposal : proposalsToFilter) { if(returnEqualedVariablesOnly) { // This is used for validation. if (proposal.equals(filter)) { TextProposal kbProposal =3D new TextProposal(); kbProposal.setReplacementString(proposal); - = + setImage(kbProposal); - = + kbProposals.add(kbProposal); = break; @@ -350,48 +393,48 @@ } else if (proposal.startsWith(filter)) { // This is used for CA. TextProposal kbProposal =3D new TextProposal(); - = + String replacementString =3D proposal.substring(filter.length()); if (bSurroundWithQuotes) { replacementString =3D "'" + replacementString + "']"; //$NON-NLS-1$ = //$NON-NLS-2$ } - = + kbProposal.setReplacementString(replacementString); kbProposal.setImage(getELProposalImage()); - = + kbProposals.add(kbProposal); } } } - status.setProposals(kbProposals); - if (status.isOK()){ - status.setLastResolvedToken(expr); + segment.setResolved(!kbProposals.isEmpty()); + if (resolution.isResolved()){ + resolution.setLastResolvedToken(expr); } } = protected void processSingularMember(Variable mbr, Set kbPr= oposals) { - // Surround the "long" keys containing the dots with [' '] = - TreeSet keys =3D new TreeSet(String.CASE_INSENSITIVE_OR= DER); - keys.addAll(mbr.getKeys()); - Iterator sortedKeys =3D keys.iterator(); - while(sortedKeys.hasNext()) { - String key =3D sortedKeys.next(); - if (key =3D=3D null || key.length() =3D=3D 0) - continue; - if (key.indexOf('.') !=3D -1) { - TextProposal proposal =3D new TextProposal(); - proposal.setReplacementString("['" + key + "']"); //$NON-NLS-1$ //$NO= N-NLS-2$ - setImage(proposal); - = - kbProposals.add(proposal); - } else { - TextProposal proposal =3D new TextProposal(); - proposal.setReplacementString(key); - setImage(proposal); - = - kbProposals.add(proposal); - } + // Surround the "long" keys containing the dots with [' '] = + TreeSet keys =3D new TreeSet(String.CASE_INSENSITIVE_ORD= ER); + keys.addAll(mbr.getKeys()); + Iterator sortedKeys =3D keys.iterator(); + while(sortedKeys.hasNext()) { + String key =3D sortedKeys.next(); + if (key =3D=3D null || key.length() =3D=3D 0) + continue; + if (key.indexOf('.') !=3D -1) { + TextProposal proposal =3D new TextProposal(); + proposal.setReplacementString("['" + key + "']"); //$NON-NLS-1$ //$NON= -NLS-2$ + setImage(proposal); + = + kbProposals.add(proposal); + } else { + TextProposal proposal =3D new TextProposal(); + proposal.setReplacementString(key); + setImage(proposal); + = + kbProposals.add(proposal); } + } } = protected void filterSingularMember(Variable mbr, Set proposalsTo= Filter) { @@ -401,11 +444,11 @@ } } = - static class Variable { + static class Variable implements IVariable { IFile f; String name; String basename; - = + public Variable(String name, String basename, IFile f) { this.name =3D name; this.basename =3D basename; @@ -415,11 +458,11 @@ public String getName() { return name; } - = + public String getBasename() { return basename; } - = + public Collection getKeys() { TreeSet result =3D new TreeSet(); IModelNature n =3D EclipseResourceUtil.getModelNature(f.getProject()); @@ -433,5 +476,4 @@ return result; } } - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/XmlContentAssistProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/XmlContentAssistProcessor.java 2009-09-16 06:09:18 UTC (rev 17= 605) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/XmlContentAssistProcessor.java 2009-09-16 06:45:26 UTC (rev 17= 606) @@ -22,7 +22,7 @@ import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; import org.jboss.tools.common.el.core.resolver.ELContext; import org.jboss.tools.common.el.core.resolver.ELContextImpl; -import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus; +import org.jboss.tools.common.el.core.resolver.ELResolution; import org.jboss.tools.common.el.core.resolver.ELResolver; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; import org.jboss.tools.common.el.core.resolver.Var; @@ -55,15 +55,15 @@ } = protected void setVars(ELContextImpl context, IFile file) { - ELCompletionEngine fakeEngine =3D new ELCompletionEngine(){ - = - public ELOperandResolveStatus resolveELOperand(IFile file, + ELCompletionEngine fakeEngine =3D new ELCompletionEngine() { + + public ELResolution resolveELOperand(IFile file, ELExpression operand, boolean returnEqualedVariablesOnly, List vars, ElVarSearcher varSearcher) throws BadLocationException, StringIndexOutOfBoundsException { return null; } - = + public ELParserFactory getParserFactory() { return ELParserUtil.getJbossFactory(); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/PageProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/PageProcessor.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/PageProcessor.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -95,7 +95,7 @@ String elString =3D value; ELResolver[] resolvers =3D context.getElResolvers(); for (int i =3D 0; resolvers !=3D null && i < resolvers.length; i++) { - proposals.addAll(resolvers[i].getCompletions(elString, !query.isMask()= , query.getOffset(), context)); + proposals.addAll(resolvers[i].getProposals(context, elString)); } } return proposals.toArray(new TextProposal[proposals.size()]); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/el/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -17,12 +17,10 @@ = import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.el.core.model.ELArgumentInvocation; import org.jboss.tools.common.el.core.model.ELExpression; @@ -38,22 +36,25 @@ import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; import org.jboss.tools.common.el.core.resolver.ELContext; -import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.ELSegment; +import org.jboss.tools.common.el.core.resolver.ELSegmentImpl; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.IVariable; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegmentImpl; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.Var; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInf= o; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberPre= sentation; +import org.jboss.tools.common.el.internal.core.parser.token.JavaNameTokenD= escription; import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.web.kb.IPageContext; +import org.jboss.tools.jst.web.kb.WebKbPlugin; = -public abstract class AbstractELCompletionEngine implements ELResolver, ELCompletionEngine { +public abstract class AbstractELCompletionEngine impl= ements ELResolver, ELCompletionEngine { = - public static interface IVariable { - public String getName(); - } - public AbstractELCompletionEngine() {} = public abstract Image getELProposalImage(); @@ -62,14 +63,35 @@ = /* * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELResolver#getCompletions= (java.lang.String, boolean, int, org.jboss.tools.common.el.core.resolver.EL= Context) + * @see org.jboss.tools.common.el.core.resolver.ELResolver2#getProposals(= org.jboss.tools.common.el.core.resolver.ELContext, java.lang.String) */ - public List getCompletions(String elString, boolean returnE= qualedVariablesOnly, int position, ELContext context) { - IDocument document =3D null; - if(context instanceof IPageContext) { - IPageContext pageContext =3D (IPageContext)context; - document =3D pageContext.getDocument(); + public List getProposals(ELContext context, String el) { + return getCompletions(el, false, 0, context); + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolver2#resolve(org.j= boss.tools.common.el.core.resolver.ELContext, org.jboss.tools.common.el.cor= e.model.ELExpression) + */ + public ELResolution resolve(ELContext context, ELExpression operand) { + List vars =3D new ArrayList(); + Var[] array =3D context.getVars(); + for (int i =3D 0; i < array.length; i++) { + vars.add(array[i]); } + ELResolutionImpl resolution =3D null; + try { + resolution =3D resolveELOperand(context.getResource(), operand, true, v= ars, new ElVarSearcher(context.getResource(), this)); + resolution.setContext(context); + } catch (StringIndexOutOfBoundsException e) { + log(e); + } catch (BadLocationException e) { + log(e); + } + return resolution; + } + + private List getCompletions(String elString, boolean return= EqualedVariablesOnly, int position, ELContext context) { List vars =3D new ArrayList(); Var[] array =3D context.getVars(); for (int i =3D 0; i < array.length; i++) { @@ -77,7 +99,7 @@ } List proposals =3D null; try { - proposals =3D getCompletions(context.getResource(), document, elString= .subSequence(0, elString.length()), position, returnEqualedVariablesOnly, v= ars); + proposals =3D getCompletions(context.getResource(), elString.subSequen= ce(0, elString.length()), position, returnEqualedVariablesOnly, vars); } catch (StringIndexOutOfBoundsException e) { log(e); } catch (BadLocationException e) { @@ -108,37 +130,30 @@ * @throws BadLocationException if accessing the current document fails * @throws StringIndexOutOfBoundsException */ - public List getCompletions(IFile file, IDocument document, = CharSequence prefix, = + public List getCompletions(IFile file, CharSequence prefix, = int position, boolean returnEqualedVariablesOnly, List vars) throw= s BadLocationException, StringIndexOutOfBoundsException { List completions =3D new ArrayList(); - = - ELOperandResolveStatus status =3D resolveELOperand(file, parseOperand(""= + prefix), returnEqualedVariablesOnly, vars, new ElVarSearcher(file, this)= ); //$NON-NLS-1$ - if (status.isOK()) { - completions.addAll(status.getProposals()); - } = + ELResolutionImpl resolution =3D resolveELOperand(file, parseOperand("" += prefix), returnEqualedVariablesOnly, vars, new ElVarSearcher(file, this));= //$NON-NLS-1$ + completions.addAll(resolution.getProposals()); + return completions; } = - /* - * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELResolver#resolveELOpera= nd(org.jboss.tools.common.el.core.model.ELExpression, org.jboss.tools.commo= n.el.core.resolver.ELContext, boolean) - */ - public ELOperandResolveStatus resolveELOperand(ELExpression operand, ELCo= ntext context, boolean returnEqualedVariablesOnly) { + public ELResolution resolveELOperand(ELExpression operand, ELContext cont= ext, boolean returnEqualedVariablesOnly) { List vars =3D new ArrayList(); Var[] array =3D context.getVars(); for (int i =3D 0; i < array.length; i++) { vars.add(array[i]); } - ELOperandResolveStatus status =3D null; try { - status =3D resolveELOperand(context.getResource(), operand, returnEqual= edVariablesOnly, vars, new ElVarSearcher(context.getResource(), this)); + return resolveELOperand(context.getResource(), operand, returnEqualedVa= riablesOnly, vars, new ElVarSearcher(context.getResource(), this)); } catch (StringIndexOutOfBoundsException e) { log(e); } catch (BadLocationException e) { log(e); } - return status; + return null; } = public ELExpression parseOperand(String operand) { @@ -169,17 +184,13 @@ return proposals; } = - protected ELOperandResolveStatus newELOperandResolveStatus(ELInvocationEx= pression tokens) { - return new ELOperandResolveStatus(tokens); - } - - public ELOperandResolveStatus resolveELOperand(IFile file, + public ELResolutionImpl resolveELOperand(IFile file, ELExpression operand, boolean returnEqualedVariablesOnly, List vars, ElVarSearcher varSearcher) throws BadLocationException, StringIndexOutOfBoundsException { if(operand =3D=3D null) { //TODO - return newELOperandResolveStatus(null); + return null; } String oldEl =3D operand.getText(); Var var =3D varSearcher.findVarForEl(oldEl, vars, true); @@ -187,8 +198,15 @@ String newEl =3D oldEl; TypeInfoCollector.MemberInfo member =3D null; boolean isArray =3D false; + ELResolution varELResolution =3D null; if(var!=3Dnull) { - member =3D resolveEL(file, var.getElToken(), true); + varELResolution =3D resolveEL(file, var.getElToken(), true); + if(varELResolution!=3Dnull && varELResolution.isResolved()) { + ELSegment segment =3D varELResolution.getLastSegment(); + if(segment instanceof JavaMemberELSegment) { + member =3D ((JavaMemberELSegment)segment).getMemberInfo(); + } + } if(member!=3Dnull) { if(!member.getType().isArray()) { IType type =3D member.getMemberType(); @@ -221,62 +239,84 @@ : parseOperand(newEl)) = : operand; = - ELOperandResolveStatus status =3D resolveELOperand(file, newOperand, ret= urnEqualedVariablesOnly, prefixWasChanged); + ELResolutionImpl resolution =3D resolveELOperand(file, newOperand, retur= nEqualedVariablesOnly, prefixWasChanged); = if(prefixWasChanged) { - ELInvocationExpression newLastResolvedToken =3D status.getLastResolvedT= oken(); - status.setTokens((ELInvocationExpression)operand); - if(newLastResolvedToken !=3D null) { - if(status.getUnresolvedTokens() !=3D null = - && status.getUnresolvedTokens().getInvocationStartPosition() - statu= s.getUnresolvedTokens().getStartPosition() < var.getElToken().getLength() += suffix.length()) { - // Last resolved token is token from "var". Set first token of origin= al EL as last resolved one. - status.setLastResolvedToken(null); + resolution.setSourceOperand(operand); + + // Replace segment which came from var resolution to original first seg= ment. + LexicalToken firstOriginalToken =3D operand.getFirstToken(); + LexicalToken nextOriginalToken =3D firstOriginalToken; + List newSegments =3D resolution.getSegments(); + List resultSegments =3D new ArrayList(); + int startSuffix =3D var.getElToken().getText().length(); + int endSuffix =3D startSuffix + suffix.length(); + ELSegment firstSegment =3D null; + for (ELSegment segment : newSegments) { + int startPosition =3D segment.getToken().getStart(); + if(startPosition>=3DendSuffix) { + resultSegments.add(segment); + nextOriginalToken =3D nextOriginalToken.findTokenForward(JavaNameToke= nDescription.JAVA_NAME); + ((ELSegmentImpl)segment).setToken(nextOriginalToken); } else { - // Last resolved token is token outside "var" prefix. Correct last re= solved token. - int oldLastResolvedTokenStart =3D newLastResolvedToken.getInvocationS= tartPosition() - var.getElToken().getText().length() - suffix.length() + va= r.getName().length(); - if(newLastResolvedToken.getLeft() =3D=3D null) { - //In this case we do not need to take into account difference in len= gth of var and its expression. - oldLastResolvedTokenStart =3D newLastResolvedToken.getInvocationStar= tPosition(); - } - ELInvocationExpression l =3D (ELInvocationExpression)operand; - while(l !=3D null) { - if(l.getInvocationStartPosition() - l.getStartPosition() <=3D oldLas= tResolvedTokenStart) { - status.setLastResolvedToken(l); - break; - } - l =3D l.getLeft(); - } + firstSegment =3D segment; + ((ELSegmentImpl)firstSegment).setToken(firstOriginalToken); +// if(firstSegment instanceof JavaMemberELSegmentImpl) { +// JavaMemberELSegmentImpl javaSegment =3D (JavaMemberELSegmentImpl) = firstSegment; +// MemberInfo m =3D javaSegment.getMemberInfo(); +// if(m!=3Dnull) { +// TypeInfoCollector.Type t =3D m.getType(); +// if(t!=3Dnull) { +// javaSegment.setElement(t.getSource()); +// } +// } +// } } + } + + if(firstSegment!=3Dnull && firstSegment.isResolved()) { + resultSegments.add(0, firstSegment); + resolution.setSegments(resultSegments); var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); //= $NON-NLS-1$ //$NON-NLS-2$ + + ELResolutionImpl oldElResolution =3D resolveELOperand(file, operand, r= eturnEqualedVariablesOnly, false); + resolution.getProposals().addAll(oldElResolution.getProposals()); + } else { + resolution =3D resolveELOperand(file, operand, returnEqualedVariablesO= nly, false); } + } = - ELOperandResolveStatus oldElStatus =3D resolveELOperand(file, operand, = returnEqualedVariablesOnly, false); - status.getProposals().addAll(oldElStatus.getProposals()); - } - = // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> if(!returnEqualedVariablesOnly && vars!=3Dnull) { = for (Var v : vars) { String prefix =3D operand.toString(); if(v.getName().startsWith(prefix)) { - MemberInfo memberInfo =3D resolveEL(file, v.getElToken(), true, vars,= varSearcher); + ELResolution r =3D resolveEL(file, v.getElToken(), true, vars, varSea= rcher); + ELSegment lastSegment =3D r.getLastSegment(); + MemberInfo memberInfo =3D null; + if(lastSegment instanceof JavaMemberELSegment) { + memberInfo =3D ((JavaMemberELSegment)lastSegment).getMemberInfo(); + } + String sourceTypeName =3D memberInfo =3D=3D null ? null : memberInfo.= getDeclaringTypeQualifiedName(); - if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = + if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) { sourceTypeName =3D Signature.getSimpleName(sourceTypeName); + } String typeName =3D memberInfo =3D=3D null ? null : memberInfo.getTyp= e().getName(); - if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = + if (typeName !=3D null && typeName.indexOf('.') !=3D -1) { = typeName =3D Signature.getSimpleName(typeName); - = + } + IJavaElement element =3D memberInfo =3D=3D null ? null : memberInfo.g= etJavaElement(); String attachedJavaDoc =3D null; - = + try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); } catch (JavaModelException e) { - // Ignore + WebKbPlugin.getDefault().logError(e); } - = + String varNameProposal =3D v.getName().substring(prefix.length()); TextProposal proposal =3D new TextProposal(); proposal.setLabel(v.getName()); @@ -286,58 +326,57 @@ proposal.setType(typeName); proposal.setSourceType(sourceTypeName); proposal.setContextInfo(attachedJavaDoc); - status.getProposals().add(proposal); + resolution.getProposals().add(proposal); } } } // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes = - - return status; + return resolution; } = /** - * Returns MemberInfo for last segment of EL. Null if El is not resolved. + * Returns ELResolution for EL. * @param seamProject * @param file * @param operand EL without #{} - * @return MemberInfo for last segment of EL. Null if El is not resolved. + * Returns ELResolution for EL. * @throws BadLocationException * @throws StringIndexOutOfBoundsException */ - public TypeInfoCollector.MemberInfo resolveEL(IFile file, ELExpression op= erand, boolean varIsUsed) throws BadLocationException, StringIndexOutOfBoun= dsException { + public ELResolution resolveEL(IFile file, ELExpression operand, boolean v= arIsUsed) throws BadLocationException, StringIndexOutOfBoundsException { if(!(operand instanceof ELInvocationExpression)) return null; - ELOperandResolveStatus status =3D resolveELOperand(file, operand, true, = varIsUsed); - return status.getMemberOfResolvedOperand(); + return resolveELOperand(file, operand, true, varIsUsed); } = /** - * Returns MemberInfo for last segment of EL. Null if El is not resolved. + * Returns ELResolution for EL. * @param seamProject * @param file * @param operand EL without #{} - * @return MemberInfo for last segment of EL. Null if El is not resolved. + * @return ELResolution for EL. * @throws BadLocationException * @throws StringIndexOutOfBoundsException */ - public TypeInfoCollector.MemberInfo resolveEL(IFile file, ELExpression op= erand, boolean returnEqualedVariablesOnly, List vars, ElVarSearcher va= rSearcher) throws BadLocationException, StringIndexOutOfBoundsException { + public ELResolution resolveEL(IFile file, ELExpression operand, boolean r= eturnEqualedVariablesOnly, List vars, ElVarSearcher varSearcher) throw= s BadLocationException, StringIndexOutOfBoundsException { if(!(operand instanceof ELInvocationExpression)) return null; - ELOperandResolveStatus status =3D resolveELOperand(file, operand, return= EqualedVariablesOnly, vars, varSearcher); - return status.getMemberOfResolvedOperand(); + return resolveELOperand(file, operand, returnEqualedVariablesOnly, vars,= varSearcher); } - = - public ELOperandResolveStatus resolveELOperand(IFile file, ELExpression o= perand, = + + public ELResolutionImpl resolveELOperand(IFile file, ELExpression operand= , = boolean returnEqualedVariablesOnly, boolean varIsUsed) throws BadLocati= onException, StringIndexOutOfBoundsException { if(!(operand instanceof ELInvocationExpression) || file =3D=3D null) { - return newELOperandResolveStatus(null); + return null; } = + ELResolutionImpl resolution =3D new ELResolutionImpl(); + resolution.setSourceOperand(operand); + ELInvocationExpression expr =3D (ELInvocationExpression)operand; boolean isIncomplete =3D expr.getType() =3D=3D ELObjectType.EL_PROPERTY_= INVOCATION = && ((ELPropertyInvocation)expr).getName() =3D=3D null; boolean isArgument =3D expr.getType() =3D=3D ELObjectType.EL_ARGUMENT_IN= VOCATION; = - ELOperandResolveStatus status =3D newELOperandResolveStatus(expr); ELInvocationExpression left =3D expr; = List resolvedVariables =3D new ArrayList(); @@ -359,19 +398,14 @@ returnEqualedVariablesOnly); if (resolvedVars !=3D null && !resolvedVars.isEmpty()) { resolvedVariables =3D resolvedVars; - status.setLastResolvedToken(left); + resolution.setLastResolvedToken(left); break; } left =3D (ELInvocationExpression)left.getLeft(); } = } = - // Save all resolved variables. It's useful for incremental validation. - if(resolvedVariables !=3D null && !resolvedVariables.isEmpty()) { - setUsedVariables(status, resolvedVariables); - } - - if (status.getResolvedTokens() =3D=3D null && = + if (resolution.getLastResolvedToken() =3D=3D null && = !returnEqualedVariablesOnly && = expr !=3D null && = isIncomplete) { @@ -380,26 +414,31 @@ resolvedVariables =3D resolveVariables(file, expr, true, returnEqualedV= ariablesOnly); = = Set proposals =3D new TreeSet(TextProposal.= KB_PROPOSAL_ORDER); + JavaMemberELSegmentImpl segment =3D new JavaMemberELSegmentImpl(); + segment.setToken(expr.getFirstToken()); + segment.setResolved(false); + resolution.addSegment(segment); for (V var : resolvedVariables) { String varName =3D var.getName(); if(varName.startsWith(operand.getText())) { // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> + MemberInfo member =3D getMemberInfoByVariable(var, true); - = + String sourceTypeName =3D member =3D=3D null ? null : member.getDecla= ringTypeQualifiedName(); if (sourceTypeName !=3D null && sourceTypeName.indexOf('.') !=3D -1) = sourceTypeName =3D Signature.getSimpleName(sourceTypeName); String typeName =3D member =3D=3D null ? null : member.getType().getN= ame(); if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = typeName =3D Signature.getSimpleName(typeName); - = + IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); String attachedJavaDoc =3D null; - = + try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); + attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); } catch (JavaModelException e) { - // Ignore + WebKbPlugin.getDefault().logError(e); } = TextProposal proposal =3D new TextProposal(); @@ -409,27 +448,33 @@ proposal.setType(typeName); proposal.setSourceType(sourceTypeName); proposal.setContextInfo(attachedJavaDoc); - = + proposals.add(proposal); // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes } } - status.setProposals(proposals); - return status; + resolution.setProposals(proposals); + return resolution; } = // Here we have a list of vars for some part of expression // OK. we'll proceed with members of these vars - if (status.getResolvedTokens() =3D=3D status.getTokens()) { + if (resolution.getLastResolvedToken() =3D=3D operand) { // First segment is the last one Set proposals =3D new TreeSet(TextProposal.= KB_PROPOSAL_ORDER); // In some cases there may be a few references to the same variable nam= e. // For example @Factory and @DataModel. We should use @DataModel instea= d of @Factory // method which returns null. // See https://jira.jboss.org/jira/browse/JBIDE-3694 - = + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> TypeInfoCollector.MemberInfo bijectedAttribute =3D null; + + JavaMemberELSegmentImpl segment =3D new JavaMemberELSegmentImpl(); + segment.setToken(operand.getFirstToken()); + segment.setResolved(true); + resolution.addSegment(segment); + for (V var : resolvedVariables) { if(isSingularAttribute(var)) { bijectedAttribute =3D getMemberInfoByVariable(var, true); @@ -443,11 +488,11 @@ typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaEle= ment(); String attachedJavaDoc =3D null; - = + try { attachedJavaDoc =3D element =3D=3D null ? null : element.getAttachedJ= avadoc(null); } catch (JavaModelException e) { - // Ignore + WebKbPlugin.getDefault().logError(e); } = String varName =3D var.getName(); @@ -470,71 +515,89 @@ proposal.setContextInfo(attachedJavaDoc); proposals.add(proposal); } - status.setMemberOfResolvedOperand(bijectedAttribute!=3Dnull?bijectedAt= tribute:getMemberInfoByVariable(var, true)); + segment.setMemberInfo(bijectedAttribute!=3Dnull?bijectedAttribute:getM= emberInfoByVariable(var, true)); + segment.getVariables().add(var); } // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes = - status.setLastResolvedToken(expr); - status.setProposals(proposals); - return status; + resolution.setLastResolvedToken(expr); + resolution.setProposals(proposals); + return resolution; } = // First segment is found - proceed with next tokens = List members =3D new ArrayList(); + JavaMemberELSegmentImpl segment =3D new JavaMemberELSegmentImpl(); + segment.setToken(expr.getFirstToken()); for (V var : resolvedVariables) { TypeInfoCollector.MemberInfo member =3D getMemberInfoByVariable(var, re= turnEqualedVariablesOnly); - if (member !=3D null && !members.contains(member)) = + if (member !=3D null && !members.contains(member)) { = members.add(member); + segment.setMemberInfo(member); + segment.getVariables().add(var); + segment.setResolved(true); + } } + resolution.addSegment(segment); //process segments one by one - if(left !=3D null) while(left !=3D expr) { - left =3D (ELInvocationExpression)left.getParent(); - if (left !=3D expr) { // inside expression - if(left instanceof ELArgumentInvocation) { - String s =3D "#{" + left.getLeft().toString() + collectionAdditionFor= CollectionDataModel + "}"; //$NON-NLS-1$ //$NON-NLS-2$ - ELParser p =3D getParserFactory().createParser(); - ELInvocationExpression expr1 =3D (ELInvocationExpression)p.parse(s).g= etInstances().get(0).getExpression(); - members =3D resolveSegment(expr1.getLeft(), members, status, returnEq= ualedVariablesOnly, varIsUsed); - members =3D resolveSegment(expr1, members, status, returnEqualedVaria= blesOnly, varIsUsed); - if(status.getLastResolvedToken() =3D=3D expr1) { - status.setLastResolvedToken(left); + if(left !=3D null) { + while(left !=3D expr) { + left =3D (ELInvocationExpression)left.getParent(); + if (left !=3D expr) { // inside expression + segment =3D new JavaMemberELSegmentImpl(); + segment.setResolved(true); + if(left instanceof ELArgumentInvocation) { + String s =3D "#{" + left.getLeft().toString() + collectionAdditionFo= rCollectionDataModel + "}"; //$NON-NLS-1$ //$NON-NLS-2$ + ELParser p =3D getParserFactory().createParser(); + ELInvocationExpression expr1 =3D (ELInvocationExpression)p.parse(s).= getInstances().get(0).getExpression(); + members =3D resolveSegment(expr1.getLeft(), members, resolution, ret= urnEqualedVariablesOnly, varIsUsed, segment); + members =3D resolveSegment(expr1, members, resolution, returnEqualed= VariablesOnly, varIsUsed, segment); + if(resolution.getLastResolvedToken() =3D=3D expr1) { + resolution.setLastResolvedToken(left); + } + } else { + members =3D resolveSegment(left, members, resolution, returnEqualedV= ariablesOnly, varIsUsed, segment); } - } else { = - members =3D resolveSegment(left, members, status, returnEqualedVariab= lesOnly, varIsUsed); + if(!members.isEmpty()) { + segment.setMemberInfo(members.get(0)); + } + resolution.addSegment(segment); + } else { // Last segment + resolveLastSegment((ELInvocationExpression)operand, members, resoluti= on, returnEqualedVariablesOnly, varIsUsed); + break; } - } else { // Last segment - resolveLastSegment((ELInvocationExpression)operand, members, status, r= eturnEqualedVariablesOnly, varIsUsed); - break; } } = - if(status.getProposals().isEmpty() && status.getUnpairedGettersOrSetters= ()!=3Dnull) { - status.clearUnpairedGettersOrSetters(); + if(resolution.getProposals().isEmpty() && !resolution.getSegments().isEm= pty()) { +// && status.getUnpairedGettersOrSetters()!=3Dnull) { + ELSegment lastSegment =3D resolution.getSegments().get(resolution.getSe= gments().size()-1); + if(lastSegment instanceof JavaMemberELSegmentImpl) { + ((JavaMemberELSegmentImpl)lastSegment).clearUnpairedGettersOrSetters(); + } } - return status; + return resolution; } = abstract public List resolveVariables(IFile file, ELInvocationExpressi= on expr, boolean isFinal, boolean onlyEqualNames); = abstract protected TypeInfoCollector.MemberInfo getMemberInfoByVariable(V= var, boolean onlyEqualNames); = - protected void setUsedVariables(ELOperandResolveStatus status, List re= solvedVariables) { - } - protected boolean isSingularAttribute(V var) { return false; } = protected List resolveSegment(ELInvocationE= xpression expr, = List members, - ELOperandResolveStatus status, - boolean returnEqualedVariablesOnly, boolean varIsUsed) { + ELResolutionImpl resolution, + boolean returnEqualedVariablesOnly, boolean varIsUsed, JavaMemberELSegm= entImpl segment) { LexicalToken lt =3D (expr instanceof ELPropertyInvocation) = ? ((ELPropertyInvocation)expr).getName() - : (expr instanceof ELMethodInvocation) = + : (expr instanceof ELMethodInvocation) ? ((ELMethodInvocation)expr).getName() : null; String name =3D lt !=3D null ? lt.getText() : ""; // token.getText(); //= $NON-NLS-1$ + segment.setToken(lt); if (expr.getType() =3D=3D ELObjectType.EL_PROPERTY_INVOCATION) { // Find properties for the token List newMembers =3D new ArrayList(); @@ -542,7 +605,7 @@ if (mbr.getMemberType() =3D=3D null) continue; TypeInfoCollector infos =3D mbr.getTypeCollector(varIsUsed); if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCol= lector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); } List properties =3D infos.getProperties(= ); for (TypeInfoCollector.MemberInfo property : properties) { @@ -558,7 +621,7 @@ } members =3D newMembers; if (members !=3D null && !members.isEmpty()) - status.setLastResolvedToken(expr); + resolution.setLastResolvedToken(expr); } if (expr.getType() =3D=3D ELObjectType.EL_METHOD_INVOCATION) { // Find methods for the token @@ -570,7 +633,7 @@ if (mbr.getMemberType() =3D=3D null) continue; TypeInfoCollector infos =3D mbr.getTypeCollector(); if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCol= lector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); } List methods =3D infos.getMethods(); for (TypeInfoCollector.MemberInfo method : methods) { @@ -581,17 +644,27 @@ } members =3D newMembers; if (members !=3D null && !members.isEmpty()) - status.setLastResolvedToken(expr); + resolution.setLastResolvedToken(expr); } return members; } = protected void resolveLastSegment(ELInvocationExpression expr, = List members, - ELOperandResolveStatus status, + ELResolutionImpl resolution, boolean returnEqualedVariablesOnly, boolean varIsUsed) { Set kbProposals =3D new TreeSet(TextProposal= .KB_PROPOSAL_ORDER); - = + + JavaMemberELSegmentImpl segment =3D new JavaMemberELSegmentImpl(); + if(expr instanceof ELPropertyInvocation) { + segment.setToken(((ELPropertyInvocation)expr).getName()); + } +// segment.setToken(expr.getLastToken()); + if(segment.getToken()!=3Dnull) { + resolution.addSegment(segment); + } + resolution.setProposals(kbProposals); + if (expr.getType() =3D=3D ELObjectType.EL_PROPERTY_INVOCATION && ((ELPro= pertyInvocation)expr).getName() =3D=3D null) { // return all the methods + properties for (TypeInfoCollector.MemberInfo mbr : members) { @@ -604,10 +677,9 @@ } TypeInfoCollector infos =3D mbr.getTypeCollector(varIsUsed); if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCol= lector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); } - = - = + // JBIDE-512, JBIDE-2541 related changes =3D=3D=3D>>> /* Set methodPresentations =3D = @@ -625,7 +697,7 @@ = Set methodPresentations =3D = infos.getMethodPresentations(); - = + if (methodPresentations !=3D null) { for (MemberPresentation presentation : methodPresentations) { String presentationString =3D presentation.getPresentation(); @@ -638,11 +710,11 @@ typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaE= lement(); String attachedJavaDoc =3D null; - = + try { attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); } catch (JavaModelException e) { - // Ignore + WebKbPlugin.getDefault().logError(e); } = TextProposal proposal =3D new TextProposal(); @@ -652,7 +724,7 @@ proposal.setType(typeName); proposal.setSourceType(sourceTypeName); proposal.setContextInfo(attachedJavaDoc); - = + kbProposals.add(proposal); } } @@ -672,8 +744,8 @@ */ = Set propertyPresentations =3D = - infos.getPropertyPresentations(status.getUnpairedGettersOrSetters()); - = + infos.getPropertyPresentations(segment.getUnpairedGettersOrSetters()); + if (propertyPresentations !=3D null) { for (MemberPresentation presentation : propertyPresentations) { String presentationString =3D presentation.getPresentation(); @@ -686,11 +758,11 @@ typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaE= lement(); String attachedJavaDoc =3D null; - = + try { attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); } catch (JavaModelException e) { - // Ignore + WebKbPlugin.getDefault().logError(e); } = TextProposal proposal =3D new TextProposal(); @@ -700,12 +772,11 @@ proposal.setType(typeName); proposal.setSourceType(sourceTypeName); proposal.setContextInfo(attachedJavaDoc); - = + kbProposals.add(proposal); } } // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes - } } else if(expr.getType() !=3D ELObjectType.EL_ARGUMENT_INVOCATION) @@ -724,11 +795,11 @@ if (mbr.getMemberType() =3D=3D null) continue; TypeInfoCollector infos =3D mbr.getTypeCollector(); if (TypeInfoCollector.isNotParameterizedCollection(mbr) || TypeInfoCol= lector.isResourceBundle(mbr.getMemberType())) { - status.setMapOrCollectionOrBundleAmoungTheTokens(); + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); } proposalsToFilter.addAll(infos.getMethodPresentations()); - proposalsToFilter.addAll(infos.getPropertyPresentations(status.getUnpa= iredGettersOrSetters())); - status.setMemberOfResolvedOperand(mbr); + proposalsToFilter.addAll(infos.getPropertyPresentations(segment.getUnp= airedGettersOrSetters())); + segment.setMemberInfo(mbr); } for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter)= { // We do expect nothing but name for method tokens (No round brackets) @@ -741,15 +812,15 @@ kbProposal.setReplacementString(proposal.getPresentation()); = setImage(kbProposal, proposal); - = + kbProposals.add(kbProposal); = - status.setMemberOfResolvedOperand(proposal.getMember()); - if(status.getUnpairedGettersOrSetters()!=3Dnull) { - TypeInfoCollector.MethodInfo unpirMethod =3D status.getUnpairedGett= ersOrSetters().get(filter); - status.clearUnpairedGettersOrSetters(); + segment.setMemberInfo(proposal.getMember()); + if(segment.getUnpairedGettersOrSetters()!=3Dnull) { + TypeInfoCollector.MethodInfo unpirMethod =3D segment.getUnpairedGet= tersOrSetters().get(filter); + segment.clearUnpairedGettersOrSetters(); if(unpirMethod!=3Dnull) { - status.getUnpairedGettersOrSetters().put(filter, unpirMethod); + segment.getUnpairedGettersOrSetters().put(filter, unpirMethod); } } break; @@ -771,7 +842,7 @@ try { attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); } catch (JavaModelException e) { - // Ignore + WebKbPlugin.getDefault().logError(e); } = TextProposal kbProposal =3D new TextProposal(); @@ -781,7 +852,7 @@ kbProposal.setType(typeName); kbProposal.setSourceType(sourceTypeName); kbProposal.setContextInfo(attachedJavaDoc); - = + kbProposals.add(kbProposal); // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes } @@ -798,14 +869,14 @@ if (mbr.getMemberType() =3D=3D null) continue; try { if(TypeInfoCollector.isInstanceofType(mbr.getMemberType(), "java.util= .Map")) { //$NON-NLS-1$ - status.setMapOrCollectionOrBundleAmoungTheTokens(); + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); //if map/collection is parameterized, we might return member info fo= r value type. = return; } } catch (JavaModelException jme) { - //ignore + WebKbPlugin.getDefault().logError(jme); } - status.setMemberOfResolvedOperand(mbr); + segment.setMemberInfo(mbr); } = String filter =3D expr.getMemberName(); @@ -819,28 +890,30 @@ filter =3D filter.length() =3D=3D 1 ? "" : filter.substring(1, filter= .length() - 1); //$NON-NLS-1$ } else { //Value is set as expression itself, we cannot compute it - if(isMessages) status.setMapOrCollectionOrBundleAmoungTheTokens(); + if(isMessages) { + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); + } return; } } - = + for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter)= { if(returnEqualedVariablesOnly) { // This is used for validation. if (proposal.getPresentation().equals(filter)) { TextProposal kbProposal =3D new TextProposal(); kbProposal.setReplacementString(proposal.getPresentation()); - = + setImage(kbProposal, proposal); - = + kbProposals.add(kbProposal); = - status.setMemberOfResolvedOperand(proposal.getMember()); - if(status.getUnpairedGettersOrSetters()!=3Dnull) { - TypeInfoCollector.MethodInfo unpirMethod =3D status.getUnpairedGett= ersOrSetters().get(filter); - status.clearUnpairedGettersOrSetters(); + segment.setMemberInfo(proposal.getMember()); + if(segment.getUnpairedGettersOrSetters()!=3Dnull) { + TypeInfoCollector.MethodInfo unpirMethod =3D segment.getUnpairedGet= tersOrSetters().get(filter); + segment.clearUnpairedGettersOrSetters(); if(unpirMethod!=3Dnull) { - status.getUnpairedGettersOrSetters().put(filter, unpirMethod); + segment.getUnpairedGettersOrSetters().put(filter, unpirMethod); } } break; @@ -858,35 +931,32 @@ typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); String attachedJavaDoc =3D null; - = + try { attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); } catch (JavaModelException e) { - // Ignore + WebKbPlugin.getDefault().logError(e); } = TextProposal kbProposal =3D new TextProposal(); - = + String replacementString =3D proposal.getPresentation().substring(fil= ter.length()); if (bSurroundWithQuotes) { replacementString =3D "'" + replacementString + "']"; //$NON-NLS-1$ = //$NON-NLS-2$ } - = + kbProposal.setReplacementString(replacementString); kbProposal.setImage(getELProposalImage()); kbProposal.setType(typeName); kbProposal.setSourceType(sourceTypeName); kbProposal.setContextInfo(attachedJavaDoc); - = + kbProposals.add(kbProposal); // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes } } } - status.setProposals(kbProposals); - if (status.isOK()){ - status.setLastResolvedToken(expr); - } + segment.setResolved(!resolution.getProposals().isEmpty() || resolution.i= sMapOrCollectionOrBundleAmoungTheTokens()); } = protected boolean isSingularMember(TypeInfoCollector.MemberInfo mbr) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/core/ISeamContextVariable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/c= ore/ISeamContextVariable.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/c= ore/ISeamContextVariable.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -10,7 +10,7 @@ ************************************************************************= ******/ package org.jboss.tools.seam.core; = -import org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine.IVariable; +import org.jboss.tools.common.el.core.resolver.IVariable; = /** * Represents Seam Context Variable. Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/sea= m/internal/core/el/ContextVariableELSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/ContextVariableELSegment.java (rev = 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/ContextVariableELSegment.java 2009-09-16 06:45:26 UTC (rev = 17606) @@ -0,0 +1,25 @@ +/*************************************************************************= ****** = + * 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.seam.internal.core.el; + +import org.jboss.tools.common.el.core.resolver.ELSegment; +import org.jboss.tools.seam.core.ISeamContextVariable; + +/** + * @author Alexey Kazakov + */ +public interface ContextVariableELSegment extends ELSegment { + + /** + * @return Seam context variable + */ + ISeamContextVariable getVariable(); +} \ No newline at end of file Property changes on: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/j= boss/tools/seam/internal/core/el/ContextVariableELSegment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/el/SeamELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamELCompletionEngine.java 2009-09-16 06:09:18 UTC (rev 17= 605) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamELCompletionEngine.java 2009-09-16 06:45:26 UTC (rev 17= 606) @@ -43,13 +43,12 @@ import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.el.core.parser.ELParserUtil; -import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; -import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus; -import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELSegment; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.Var; -import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInf= o; import org.jboss.tools.common.model.project.ext.ITextSourceReference; import org.jboss.tools.common.model.project.ext.event.Change; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -74,7 +73,7 @@ * = * @author Jeremy */ -public final class SeamELCompletionEngine extends AbstractELCompletionEngi= ne implements ELCompletionEngine, ELResolver { +public final class SeamELCompletionEngine extends AbstractELCompletionEngi= ne { = private static final Image SEAM_EL_PROPOSAL_IMAGE =3D = SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_EL_IMAGE_PAT= H); @@ -106,10 +105,6 @@ SeamCorePlugin.getPluginLog().logError(e); } = - protected ELOperandResolveStatus newELOperandResolveStatus(ELInvocationEx= pression tokens) { - return new SeamELOperandResolveStatus(tokens); - } - /** * Returns a list of Seam Context Variables that is represented by EL. Nu= ll if El is not resolved. * @param project @@ -138,7 +133,6 @@ boolean isIncomplete =3D expr.getType() =3D=3D ELObjectType.EL_PROPERTY_= INVOCATION && ((ELPropertyInvocation) expr).getName() =3D=3D null; = - ELOperandResolveStatus status =3D new ELOperandResolveStatus(expr); ELInvocationExpression left =3D expr; = ScopeType scope =3D getScope(project, file); @@ -152,7 +146,6 @@ left =3D=3D expr, true); if (resolvedVars !=3D null && !resolvedVars.isEmpty()) { resolvedVariables =3D resolvedVars; - status.setLastResolvedToken(left); break; } left =3D (ELInvocationExpression) left.getLeft(); @@ -166,6 +159,7 @@ return resolvedVariables; } = + @Override public List resolveVariables(IFile file, ELInvocati= onExpression expr, boolean isFinal, boolean onlyEqualNames) { ISeamProject project =3D SeamCorePlugin.getSeamProject(file.getProject()= , false); ScopeType scope =3D getScope(project, file); @@ -184,10 +178,6 @@ } } = - protected void setUsedVariables(ELOperandResolveStatus status, List variables) { - ((SeamELOperandResolveStatus)status).setUsedVariables(variables); - } - protected boolean isSingularAttribute(ISeamContextVariable var) { return var instanceof IBijectedAttribute; } @@ -238,41 +228,8 @@ } } = -/** - private String computeVariableName(List tokens){ - if (tokens =3D=3D null) - tokens =3D new ArrayList(); - StringBuffer sb =3D new StringBuffer(); - for (ELOperandToken token : tokens) { - if (token.getType() =3D=3D ELOperandToken.EL_VARIABLE_NAME_TOKEN || - token.getType() =3D=3D ELOperandToken.EL_PROPERTY_NAME_TOKEN || - token.getType() =3D=3D ELOperandToken.EL_METHOD_TOKEN || - token.getType() =3D=3D ELOperandToken.EL_SEPARATOR_TOKEN) { - sb.append(token.getText()); - } - } - return sb.toString(); - } -*/ - -/** - private boolean areEqualExpressions(Listfirst, Listsecond) { - if (first =3D=3D null || second =3D=3D null) - return (first =3D=3D second); - - if (first.size() !=3D second.size()) - return false; - - for (int i =3D 0; i < first.size(); i++) { - if (!first.get(i).equals(second.get(i))) - return false; - } - return true; - } -*/ - - /* Returns scope for the resource - * = + /** + * Returns scope for the resource * @param project * @param resource * @return @@ -293,9 +250,6 @@ return null; } = - - = - = public List resolveVariables(ISeamProject project, = ScopeType scope, ELInvocationExpression expr, boolean isFinal, boolean only= EqualNames) { ListresolvedVars =3D new ArrayList(); = @@ -466,15 +420,15 @@ ISeamProject project, IFile file, = ELInvocationExpression expr) throws BadLocationException, StringIndexOu= tOfBoundsException { List res =3D new ArrayList(); - = + ElVarSearcher varSearcher =3D new ElVarSearcher(file, this); List vars =3D varSearcher.findAllVars(file, expr.getStartPosition()= ); = - ELOperandResolveStatus status =3D resolveELOperand(file, expr, true, var= s, varSearcher); - if (status.isOK()) { - MemberInfo member =3D status.getMemberOfResolvedOperand(); - if (member !=3D null) { - IJavaElement el =3D member.getJavaElement(); + ELResolution resolution =3D resolveELOperand(file, expr, true, vars, var= Searcher); + if (resolution.isResolved()) { + ELSegment segment =3D resolution.getLastSegment(); + if(segment instanceof JavaMemberELSegment) { + IJavaElement el =3D ((JavaMemberELSegment)segment).getJavaElement(); if (el !=3D null) { res.add(el); return res; Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/s= eam/internal/core/el/SeamELOperandResolveStatus.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamELOperandResolveStatus.java 2009-09-16 06:09:18 UTC (re= v 17605) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamELOperandResolveStatus.java 2009-09-16 06:45:26 UTC (re= v 17606) @@ -1,40 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.seam.internal.core.el; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.tools.common.el.core.model.ELInvocationExpression; -import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus; -import org.jboss.tools.seam.core.ISeamContextVariable; - -public class SeamELOperandResolveStatus extends ELOperandResolveStatus { - public List usedVariables; - - public SeamELOperandResolveStatus(ELInvocationExpression tokens) { - super(tokens); - } - - /** - * @return List of Seam Context Variables used in EL. = - */ - public List getUsedVariables() { - return (usedVariables =3D=3D null ? new ArrayList(= ) : usedVariables); - } - - /** - * @param usedVariables List of Seam Context Variables used in EL. - */ - public void setUsedVariables(List usedVariables) { - this.usedVariables =3D usedVariables; - } -} Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/el/SeamExpressionResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamExpressionResolver.java 2009-09-16 06:09:18 UTC (rev 17= 605) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamExpressionResolver.java 2009-09-16 06:45:26 UTC (rev 17= 606) @@ -28,6 +28,9 @@ import org.jboss.tools.common.el.core.model.ELModel; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELSegment; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegmentImpl; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInf= o; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.Type; @@ -93,20 +96,6 @@ return internalResolveVariables(project, name, onlyEqualNames, variables= ); } = - /** - * Returns Seam project variables which names start from specified value - * Search is performed using scope - * = - * @param project - * @param scope - * @param name - * @return - */ - private static List internalResolveVariablesByScope= (ISeamProject project, ScopeType scope, String name, boolean onlyEqualNames= ) { - Set variables =3D project.getVariablesByScope(scop= e, true); - return internalResolveVariables(project, name, onlyEqualNames, variables= ); - } - = private static List internalResolveVariables(ISeamP= roject project, String name, boolean onlyEqualNames, Set variables) { List resolvedVariables =3D new ArrayList(); if(onlyEqualNames) { @@ -352,11 +341,17 @@ if(ex instanceof ELInvocationExpression) { ELInvocationExpression expr =3D (ELInvocationExpression)ex; try { - member =3D engine.resolveEL(null, expr, false); + ELResolution resolution =3D engine.resolveEL(null, expr, false); + if(resolution.isResolved()) { + ELSegment segment =3D resolution.getLastSegment(); + if(segment instanceof JavaMemberELSegmentImpl) { + member =3D ((JavaMemberELSegmentImpl)segment).getMemberInfo(); + } + } } catch (StringIndexOutOfBoundsException e) { - e.printStackTrace(); + SeamCorePlugin.getDefault().logError(e); } catch (BadLocationException e) { - e.printStackTrace(); + SeamCorePlugin.getDefault().logError(e); } } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/el/SeamPromptingProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamPromptingProvider.java 2009-09-16 06:09:18 UTC (rev 176= 05) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamPromptingProvider.java 2009-09-16 06:45:26 UTC (rev 176= 06) @@ -59,7 +59,7 @@ return list; } else if(MEMBERS.equals(id)) { try { - List proposals =3D engine.getCompletions(f, null, prefix= , prefix.length(), false, new ArrayList()); + List proposals =3D engine.getCompletions(f, prefix, pref= ix.length(), false, new ArrayList()); List suggestions =3D new ArrayList(); if(proposals !=3D null) for (TextProposal proposal: proposals) { suggestions.add(proposal.getReplacementString()); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/validation/SeamELValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/validation/SeamELValidator.java 2009-09-16 06:09:18 UTC (rev 1= 7605) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/validation/SeamELValidator.java 2009-09-16 06:45:26 UTC (rev 1= 7606) @@ -58,19 +58,22 @@ import org.jboss.tools.common.el.core.model.ELPropertyInvocation; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.el.core.parser.SyntaxError; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELSegment; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.IVariable; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegmentImpl; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.Var; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.util.FileUtil; -import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCoreMessages; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamPreferences; import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine; -import org.jboss.tools.seam.internal.core.el.SeamELOperandResolveStatus; import org.w3c.dom.Node; import org.w3c.dom.NodeList; = @@ -409,58 +412,67 @@ boolean unresolvedTokenIsVariable =3D false; try { if (!operand.endsWith(".")) { //$NON-NLS-1$ - SeamELOperandResolveStatus status =3D = - (SeamELOperandResolveStatus)engine.resolveELOperand(file, operandToke= n, true, varListForCurentValidatedNode, elVarSearcher); + ELResolution resolution =3D engine.resolveELOperand(file, operandToken= , true, varListForCurentValidatedNode, elVarSearcher); = - if(status.isError()) { + if(!resolution.isResolved()) { Set names =3D findVariableNames(operandToken); for (String name : names) { validationContext.addLinkedEl(name, elReference); } } = + List segments =3D resolution.getSegments(); + List usedVariables =3D new ArrayList(); + for (ELSegment segment : segments) { + if(!segment.getVariables().isEmpty()) { + usedVariables.addAll(segment.getVariables()); + } + // Check pair for getter/setter + if(segment instanceof JavaMemberELSegmentImpl) { + JavaMemberELSegmentImpl javaSegment =3D (JavaMemberELSegmentImpl)seg= ment; + if(!javaSegment.getUnpairedGettersOrSetters().isEmpty()) { + TypeInfoCollector.MethodInfo unpairedMethod =3D javaSegment.getUnpa= iredGettersOrSetters().values().iterator().next(); + String methodName =3D unpairedMethod.getName(); + String propertyName =3D javaSegment.getUnpairedGettersOrSetters().k= eySet().iterator().next(); + String missingMethodName =3D SeamCoreMessages.SEAM_EL_VALIDATOR_SET= TER; + String existedMethodName =3D SeamCoreMessages.SEAM_EL_VALIDATOR_GET= TER; + if(methodName.startsWith("s")) { //$NON-NLS-1$ + missingMethodName =3D existedMethodName; + existedMethodName =3D SeamCoreMessages.SEAM_EL_VALIDATOR_SETTER; + } + int startPosition =3D documnetOffset + operandToken.getStartPositio= n(); + int length =3D operandToken.getLength(); + int startPr =3D operand.indexOf(propertyName); + if(startPr>-1) { + startPosition =3D startPosition + startPr; + length =3D propertyName.length(); + } + IMarker marker =3D addError(UNPAIRED_GETTER_OR_SETTER_MESSAGE_ID, S= eamPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existe= dMethodName, missingMethodName}, length, startPosition, file); + elReference.addMarker(marker); + } + } + } // Save links between resource and used variables names - for(ISeamContextVariable variable: status.getUsedVariables()) { + for(IVariable variable: usedVariables) { validationContext.addLinkedEl(variable.getName(), elReference); } = - // Check pair for getter/setter - if(!status.getUnpairedGettersOrSetters().isEmpty()) { - TypeInfoCollector.MethodInfo unpairedMethod =3D status.getUnpairedGet= tersOrSetters().values().iterator().next(); - String methodName =3D unpairedMethod.getName(); - String propertyName =3D status.getUnpairedGettersOrSetters().keySet()= .iterator().next(); - String missingMethodName =3D SeamCoreMessages.SEAM_EL_VALIDATOR_SETTE= R; - String existedMethodName =3D SeamCoreMessages.SEAM_EL_VALIDATOR_GETTE= R; - if(methodName.startsWith("s")) { //$NON-NLS-1$ - missingMethodName =3D existedMethodName; - existedMethodName =3D SeamCoreMessages.SEAM_EL_VALIDATOR_SETTER; - } - int startPosition =3D documnetOffset + operandToken.getStartPosition(= ); - int length =3D operandToken.getLength(); - int startPr =3D operand.indexOf(propertyName); - if(startPr>-1) { - startPosition =3D startPosition + startPr; - length =3D propertyName.length(); - } - IMarker marker =3D addError(UNPAIRED_GETTER_OR_SETTER_MESSAGE_ID, Sea= mPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedM= ethodName, missingMethodName}, length, startPosition, file); - elReference.addMarker(marker); - } - - if (status.isOK()) { + if (resolution.isResolved()) { // It's valid EL. return; } - = - ELInvocationExpression ts =3D status.getUnresolvedTokens(); - = - varName =3D ts.getMemberName(); + + ELSegment segment =3D resolution.getUnresolvedSegment(); + LexicalToken token =3D segment.getToken(); + + varName =3D token.getText(); if(varName =3D=3D null) { //This is syntax error case. Reported by parser. return; = } - offsetOfVarName =3D documnetOffset + ts.getInvocationStartPosition(); + offsetOfVarName =3D documnetOffset + token.getStart(); lengthOfVarName =3D varName =3D=3D null ? 0 : varName.length(); - if(status.getUsedVariables().isEmpty()) { + if(usedVariables.isEmpty()) { unresolvedTokenIsVariable =3D true; } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/text/java/SeamELProposalProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= text/java/SeamELProposalProcessor.java 2009-09-16 06:09:18 UTC (rev 17605) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= text/java/SeamELProposalProcessor.java 2009-09-16 06:45:26 UTC (rev 17606) @@ -436,7 +436,7 @@ List vars =3D varSearcher.findAllVars(viewer, offset); = SeamELCompletionEngine fEngine=3D new SeamELCompletionEngine(); - List suggestions =3D fEngine.getCompletions(file, documen= t, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars); + List suggestions =3D fEngine.getCompletions(file, prefix,= offset + proposalPrefix.length() - prefix.length(), false, vars); List uniqueSuggestions =3D fEngine.makeKbUnique(suggestio= ns); = List result=3D new ArrayList(= ); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/views/properties/SeamELAttributeContentProposalProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= views/properties/SeamELAttributeContentProposalProvider.java 2009-09-16 06:= 09:18 UTC (rev 17605) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= views/properties/SeamELAttributeContentProposalProvider.java 2009-09-16 06:= 45:26 UTC (rev 17606) @@ -110,7 +110,7 @@ = List suggestions =3D null; try { - suggestions =3D engine.getCompletions(file, null, prefix, position, fa= lse, null); + suggestions =3D engine.getCompletions(file, prefix, position, false, n= ull); } catch (BadLocationException e) { SeamGuiPlugin.getPluginLog().logError(e); } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2009= -09-16 06:09:18 UTC (rev 17605) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2009= -09-16 06:45:26 UTC (rev 17606) @@ -37,7 +37,8 @@ org.jboss.tools.jst.jsp, org.jboss.tools.jst.jsp.test, org.eclipse.jdt.ui, - org.jboss.tools.vpe.ui.test + org.jboss.tools.vpe.ui.test, + org.jboss.tools.common.el.core;bundle-version=3D"2.0.0" Export-Package: org.jboss.tools.seam.ui.test, org.jboss.tools.seam.ui.test.ca, org.jboss.tools.seam.ui.test.hyperlink, --===============4842103149607102814==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 02:50:46 2009 Content-Type: multipart/mixed; boundary="===============3512621392916396385==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17607 - trunk/hibernatetools/plugins. Date: Wed, 16 Sep 2009 02:50:46 -0400 Message-ID: <200909160650.n8G6ok9Z017465@svn01.web.mwc.hst.phx2.redhat.com> --===============3512621392916396385== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: max.andersen(a)jboss.com Date: 2009-09-16 02:50:46 -0400 (Wed, 16 Sep 2009) New Revision: 17607 Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/ Log: Delete non used plugin --===============3512621392916396385==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 03:55:53 2009 Content-Type: multipart/mixed; boundary="===============6186687520866389888==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17608 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common. Date: Wed, 16 Sep 2009 03:55:53 -0400 Message-ID: <200909160755.n8G7trDi027826@svn01.web.mwc.hst.phx2.redhat.com> --===============6186687520866389888== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-16 03:55:52 -0400 (Wed, 16 Sep 2009) New Revision: 17608 Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/M= ethodNotImplementedException.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/m= essages.properties Log: fix JUnit test error in CommonAllTests.testMethodNotImplementedException Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/c= ommon/MethodNotImplementedException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= MethodNotImplementedException.java 2009-09-16 06:50:46 UTC (rev 17607) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= MethodNotImplementedException.java 2009-09-16 07:55:52 UTC (rev 17608) @@ -17,7 +17,7 @@ public class MethodNotImplementedException extends RuntimeException { = public MethodNotImplementedException() { - super("Method is not implemented yet"); //$NON-NLS-1$ + super(Messages.MethodNotImplementedException_MethodIsNotImplementedYet);= //$NON-NLS-1$ } = public MethodNotImplementedException(String message, Throwable cause) { Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/c= ommon/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= messages.properties 2009-09-16 06:50:46 UTC (rev 17607) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= messages.properties 2009-09-16 07:55:52 UTC (rev 17608) @@ -4,4 +4,4 @@ SAXValidator_UnableToInstantiateMessage=3Derror: Unable to instantiate par= ser ({0}) XMLUtilities_IOExceptionMessage=3DUnexpected parser error XMLUtilities_SAXExceptionMessage=3DUnexpected parser error -MethodNotImplementedException_MethodIsNotImplementedYet=3DMethod is not im= plemented yet = +MethodNotImplementedException_MethodIsNotImplementedYet=3DMethod is not im= plemented yet --===============6186687520866389888==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 06:46:38 2009 Content-Type: multipart/mixed; boundary="===============8742509616092762408==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17609 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring. Date: Wed, 16 Sep 2009 06:46:37 -0400 Message-ID: <200909161046.n8GAkbAd032261@svn01.web.mwc.hst.phx2.redhat.com> --===============8742509616092762408== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2009-09-16 06:46:37 -0400 (Wed, 16 Sep 2009) New Revision: 17609 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRefactorSearcher.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRenameMethodParticipant.java Log: https://jira.jboss.org/jira/browse/JBIDE-4856 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRefactorSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-16 07:55:52 UTC = (rev 17608) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-16 10:46:37 UTC = (rev 17609) @@ -337,4 +337,10 @@ = return methodName; } + = + public static boolean isSetter(String methodName){ + if(methodName.startsWith(SET)) + return true; + return false; + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRenameMethodParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRenameMethodParticipant.java 2009-09-16 07:55:= 52 UTC (rev 17608) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRenameMethodParticipant.java 2009-09-16 10:46:= 37 UTC (rev 17609) @@ -47,7 +47,8 @@ @Override public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException { - searcher.findELReferences(); + if(searcher !=3D null) + searcher.findELReferences(); = return status; } @@ -71,7 +72,11 @@ rootChange =3D new CompositeChange(""); method =3D (IMethod)element; = + if(!SeamRenameMethodSearcher.isSetter(method.getElementName())) + return false; + = oldName =3D SeamRenameMethodSearcher.getPropertyName(method.getElementN= ame()); + = newName =3D SeamRenameMethodSearcher.getPropertyName(getArguments().get= NewName()); searcher =3D new SeamRenameMethodSearcher((IFile)method.getResource(), = oldName); return true; @@ -104,7 +109,7 @@ if(!keys.contains(key)){ TextFileChange change =3D getChange(file); TextEdit edit =3D new ReplaceEdit(offset, length, text); - //change.addEdit(edit); + change.addEdit(edit); keys.add(key); } } --===============8742509616092762408==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 07:56:54 2009 Content-Type: multipart/mixed; boundary="===============9176475755637840093==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17610 - trunk/smooks/plugins/org.jboss.tools.smooks.core/model. Date: Wed, 16 Sep 2009 07:56:53 -0400 Message-ID: <200909161156.n8GBur4t014388@svn01.web.mwc.hst.phx2.redhat.com> --===============9176475755637840093== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: DartPeng Date: 2009-09-16 07:56:53 -0400 (Wed, 16 Sep 2009) New Revision: 17610 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-graphics-e= xt.xsd Removed: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-graphics-e= xt.xsd Log: JBIDE-4878 Change the unit test case Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-grap= hics-ext.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-graphics-= ext.xsd 2009-09-16 10:46:37 UTC (rev 17609) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-graphics-= ext.xsd 2009-09-16 11:56:53 UTC (rev 17610) @@ -1,92 +0,0 @@ - - - - - - Smooks Graphics - Editor Extention File Schema - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-graphi= cs-ext.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-graphics-= ext.xsd (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks-graphics-= ext.xsd 2009-09-16 11:56:53 UTC (rev 17610) @@ -0,0 +1,102 @@ + + + + + + + + Smooks Graphics Editor Extention File Schema + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/model= /smooks-graphics-ext.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain --===============9176475755637840093==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 08:21:19 2009 Content-Type: multipart/mixed; boundary="===============6881363019209209989==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17611 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring. Date: Wed, 16 Sep 2009 08:21:19 -0400 Message-ID: <200909161221.n8GCLJMT020068@svn01.web.mwc.hst.phx2.redhat.com> --===============6881363019209209989== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2009-09-16 08:21:18 -0400 (Wed, 16 Sep 2009) New Revision: 17611 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/r= efactoring/SeamRefactorContributionFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/refactoring/SeamRefactorContributionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= refactoring/SeamRefactorContributionFactory.java 2009-09-16 11:56:53 UTC (r= ev 17610) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= refactoring/SeamRefactorContributionFactory.java 2009-09-16 12:21:18 UTC (r= ev 17611) @@ -195,7 +195,7 @@ // = // additions.addContributionItem(mm, null); // } - checkPropertyName(selection, mm, additions); + //checkPropertyName(selection, mm, additions); status =3D checkContextVariableInJava(editorFile, fileContent, select= ion); } else if(XML_EXT.equalsIgnoreCase(ext) || XHTML_EXT.equalsIgnoreCase(= ext) || JSP_EXT.equalsIgnoreCase(ext)) status =3D checkContextVariableInDOM(editorFile, fileContent, selecti= on); --===============6881363019209209989==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 09:10:18 2009 Content-Type: multipart/mixed; boundary="===============3186437833403060062==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17612 - in trunk/common/plugins/org.jboss.tools.common.model: schema and 6 other directories. Date: Wed, 16 Sep 2009 09:10:17 -0400 Message-ID: <200909161310.n8GDAHMm027607@svn01.web.mwc.hst.phx2.redhat.com> --===============3186437833403060062== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-16 09:10:17 -0400 (Wed, 16 Sep 2009) New Revision: 17612 Added: trunk/common/plugins/org.jboss.tools.common.model/schema/modelnatures.ex= sd trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/project/ModelNatureExtension.java Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/meta/help/HelpPaletteHandler.java Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/meta/help/HelpUtil.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/filesystems/impl/FileSystemsTreeConstraint.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/handlers/RemoveModelNatureHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/project/ClassPathUpdate.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/project/ModelNature.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/project/Watcher.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/util/EclipseResourceUtil.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/FilePathEncoderFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4893 Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-16= 12:21:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-16= 13:10:17 UTC (rev 17612) @@ -11,6 +11,7 @@ + = Added: trunk/common/plugins/org.jboss.tools.common.model/schema/modelnature= s.exsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/schema/modelnatures.e= xsd (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/schema/modelnatures.e= xsd 2009-09-16 13:10:17 UTC (rev 17612) @@ -0,0 +1,126 @@ + + + + + + + + + [Enter description of this extension point.] + + + + + + + + + + + + + + + + + = + + + + + + + = + + + + + + + = + + + + + + + + + + + + + + + = + + + + + + + = + + + + + + + = + + + + + + + + + + = + + + + + + + + + + + + + + + [Enter the first release in which this extension point appears.] + + + + + + + + + [Enter extension point usage example here.] + + + + + + + + + [Enter API information here.] + + + + + + + + + [Enter information about supplied implementation of this extensio= n point.] + + + + + Property changes on: trunk/common/plugins/org.jboss.tools.common.model/sche= ma/modelnatures.exsd ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/common/meta/help/HelpPaletteHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/help/HelpPaletteHandler.java 2009-09-16 12:21:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/help/HelpPaletteHandler.java 2009-09-16 13:10:17 UTC (rev 17612) @@ -1,38 +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.meta.help; - -import java.util.*; -import org.jboss.tools.common.model.*; - -public class HelpPaletteHandler extends HelpHandler { - - public HelpPaletteHandler() {} - - public void executeHandler(XModelObject object, Properties prop) throw= s XModelException { - if(!isEnabled(object)) return; - XModelObject tab =3D getTabObject(object); - String key =3D (tab =3D=3D null) ? null : tab.getModelEntity().get= Name() + "_" + tab.getPathPart().replace(' ', '_'); //$NON-NLS-1$ - if(key =3D=3D null || !HelpUtil.hasHelp(key)) { - super.executeHandler(object, prop); - } else { - HelpUtil.callHelp(object.getModel(), key); - } - } - - private XModelObject getTabObject(XModelObject object) { - XModelObject tab =3D object; - while(tab !=3D null && !tab.getModelEntity().getName().startsWith(= "SharablePageTab")) //$NON-NLS-1$ - tab =3D tab.getParent(); - return tab; - } - = -} Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/meta/help/HelpUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/help/HelpUtil.java 2009-09-16 12:21:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/help/HelpUtil.java 2009-09-16 13:10:17 UTC (rev 17612) @@ -39,16 +39,6 @@ return path !=3D null && path.length() > 0; } = - public static void callHelp(XModel model, String key) throws XModelExc= eption { - String u =3D (key =3D=3D null) ? null : keys.getProperty(key); - if(u =3D=3D null) return; - //if(u.endsWith("noHelpYet.html")) ModelPlugin.log("Help for key "= + key + " is not available."); - XModelObject editor =3D model.getByPath("%Options%/External Progra= ms/Internet Browser"); //$NON-NLS-1$ - if(editor =3D=3D null) throw new XModelException("External Program= 'Internet Browser' is not set in Options."); - String f =3D "" + model.getProperties().getProperty(XModelConstant= s.HOME) + "/doc/help" + u; //$NON-NLS-1$ - OpenWithExternalHandler.start("Help", f, editor); //$NON-NLS-1$ - } - = public static boolean isHelpPluginInstalled() { for (int i =3D 0; i < PLUGINS.length; i++) if(Platform.getBundle(PLUGINS[i]) !=3D null) return true; @@ -76,22 +66,6 @@ return p; } = - public static void help(XModel model, String key) { - ServiceDialog d =3D model.getService(); - if(!hasHelp(key)) { - d.showDialog(ModelMessages.WARNING, = - MessageFormat.format("Help for key {0} is not available.", k= ey), = - new String[]{"Close"}, null, ServiceDialog.WARNING); - } else { - try { - HelpUtil.callHelp(model, key); - } catch (XModelException e) { - d.showDialog(ModelMessages.WARNING, e.getMessage(), = - new String[]{"Close"}, null, ServiceDialog.WARNING); - } - } - } - = public static void helpEclipse(XModel model, String key) { ServiceDialog d =3D model.getService(); if(!isHelpPluginInstalled()) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/filesystems/impl/FileSystemsTreeConstraint.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/FileSystemsTreeConstraint.java 2009-09-16 12:2= 1:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/FileSystemsTreeConstraint.java 2009-09-16 13:1= 0:17 UTC (rev 17612) @@ -19,7 +19,7 @@ = public void update(XModel model) {} = - String excludeExtensions =3D ".project.struts.classpath."; //$NON-NLS-= 1$ + String excludeExtensions =3D ".project.classpath."; //$NON-NLS-1$ = public boolean accepts(XModelObject object) { String entity =3D object.getModelEntity().getName(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/handlers/RemoveModelNatureHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/handlers/RemoveModelNatureHandler.java 2009-09-16 12:21:18 UTC = (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/handlers/RemoveModelNatureHandler.java 2009-09-16 13:10:17 UTC = (rev 17612) @@ -27,6 +27,7 @@ import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.project.IModelNature; +import org.jboss.tools.common.model.project.ModelNatureExtension; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.util.FileUtil; = @@ -37,16 +38,24 @@ String nature =3D getNature(object); if(nature =3D=3D null) return false; XActionImpl i =3D (XActionImpl)action; - String n =3D (nature.indexOf("struts") > 0) ? "Struts" : //$NON-NLS-1$ /= /$NON-NLS-2$ - (nature.indexOf("jsf") > 0) ? "JSF" : "Model"; //$NON-NLS-1$= //$NON-NLS-2$ //$NON-NLS-3$ - i.setDisplayName(MessageFormat.format("Remove {0} Capabilities", n)); + i.setDisplayName(MessageFormat.format("Remove {0} Capabilities", nature)= ); return true; } = private String getNature(XModelObject object) { IProject p =3D EclipseResourceUtil.getProject(object); - IModelNature n =3D EclipseResourceUtil.getModelNature(p); - return n =3D=3D null ? null : n.getID(); = + ModelNatureExtension[] es =3D ModelNatureExtension.getInstances(); + for (ModelNatureExtension ext: es) { + String name =3D ext.getName(); + if(p !=3D null && p.isAccessible()) try { + if(p.hasNature(name)) { + return ext.getDisplayName(); + } + } catch (CoreException e) { + = + } + } + return null; = } = public void executeHandler(XModelObject object, Properties p) throws XMod= elException { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/project/ClassPathUpdate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ClassPathUpdate.java 2009-09-16 12:21:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ClassPathUpdate.java 2009-09-16 13:10:17 UTC (rev 17612) @@ -39,7 +39,7 @@ String entity =3D model.getRoot().getModelEntity().getName(); if("RootDummy".equals(entity)) { //$NON-NLS-1$ String pn =3D (project =3D=3D null) ? "?" : project.getName(); //$NON-N= LS-1$ - throw new IllegalArgumentException("Struts Project " + pn + " is corrup= ted."); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("Project " + pn + " is corrupted.");= //$NON-NLS-1$ //$NON-NLS-2$ } this.model =3D model; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/project/ModelNature.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ModelNature.java 2009-09-16 12:21:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ModelNature.java 2009-09-16 13:10:17 UTC (rev 17612) @@ -201,11 +201,13 @@ public static boolean checkModelNature(IProject project) { if(project =3D=3D null || !project.isOpen()) return false; String nature =3D null; + ModelNatureExtension[] es =3D ModelNatureExtension.getInstances(); try { - if(project.hasNature("org.jboss.tools.jsf.jsfnature")) { //$NON-NLS-1$ - nature =3D "org.jboss.tools.jsf.jsfnature"; //$NON-NLS-1$ - } else if(project.hasNature("org.jboss.tools.struts.strutsnature")) { /= /$NON-NLS-1$ - nature =3D "org.jboss.tools.struts.strutsnature"; //$NON-NLS-1$ + for (ModelNatureExtension ext: es) { + if(project.hasNature(ext.getName())) { + nature =3D ext.getName(); + break; + } } } catch (CoreException e) { ModelPlugin.getPluginLog().logError(e); Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tool= s/common/model/project/ModelNatureExtension.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ModelNatureExtension.java (rev = 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ModelNatureExtension.java 2009-09-16 13:10:17 UTC (rev = 17612) @@ -0,0 +1,74 @@ +package org.jboss.tools.common.model.project; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.common.model.plugin.ModelPlugin; +import org.jboss.tools.common.model.util.ModelFeatureFactory; +import org.jboss.tools.jst.web.tld.IFilePathEncoder; + +public class ModelNatureExtension { + public static String EXTENSION_POINT =3D "org.jboss.tools.common.model.mo= delnatures"; //$NON-NLS-1$ + + String name; + String displayName; + String pathEncoder; + String watcherContributor; + IFilePathEncoder pathEncoderInstance; + + public ModelNatureExtension() {} + + public String getName() { + return name; + } + + public String getDisplayName() { + return displayName; + } + + public IFilePathEncoder getPathEncoder () { + if(pathEncoderInstance !=3D null) { + return pathEncoderInstance; + } + if(pathEncoder =3D=3D null) { + return null; + } + if(pathEncoder.length() =3D=3D 0) { + pathEncoder =3D null; + return null; + } + try { + pathEncoderInstance =3D (IFilePathEncoder)ModelFeatureFactory.getInstan= ce().createFeatureInstance(pathEncoder); + } catch (ClassCastException e) { + ModelPlugin.getPluginLog().logError(e); + } finally { + pathEncoder =3D null; + } + return pathEncoderInstance; + } + + public String getWatcherContributor() { + return watcherContributor; + } + + static ModelNatureExtension[] INSTANCES; + + public static ModelNatureExtension[] getInstances() { + if(INSTANCES !=3D null) return INSTANCES; + List list =3D new ArrayList(= ); + IExtensionPoint point =3D Platform.getExtensionRegistry().getExtensionPo= int(EXTENSION_POINT); + IConfigurationElement[] es =3D point.getConfigurationElements(); + for (IConfigurationElement e: es) { + ModelNatureExtension n =3D new ModelNatureExtension(); + n.name =3D e.getAttribute("name"); //$NON-NLS-1$ + n.displayName =3D e.getAttribute("displayName"); //$NON-NLS-1$ + n.pathEncoder =3D e.getAttribute("pathEncoder"); //$NON-NLS-1$ + n.watcherContributor =3D e.getAttribute("watcherContributor"); //$NON-N= LS-1$ + list.add(n); + } + return INSTANCES =3D list.toArray(new ModelNatureExtension[0]); + } +} Property changes on: trunk/common/plugins/org.jboss.tools.common.model/src/= org/jboss/tools/common/model/project/ModelNatureExtension.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/project/Watcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/Watcher.java 2009-09-16 12:21:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/Watcher.java 2009-09-16 13:10:17 UTC (rev 17612) @@ -21,11 +21,6 @@ import org.jboss.tools.common.model.util.ModelFeatureFactory; = public class Watcher implements XModelTreeListener { - static String[][] CONTRIBUTORS =3D new String[][]{ - {"org.jboss.tools.struts.webprj.model.helpers.sync.SyncProjectContext", = "org.jboss.tools.struts.strutsnature"}, //$NON-NLS-1$ //$NON-NLS-2$ - {"org.jboss.tools.jsf.web.JSFWatcherContributor", "org.jboss.tools.jsf.j= sfnature"} //$NON-NLS-1$ //$NON-NLS-2$ - }; - public static Watcher getInstance(XModel model) { Watcher instance =3D (Watcher)model.getManager("Watcher"); //$NON-NLS-1$ if(instance =3D=3D null) { @@ -59,13 +54,15 @@ = void updateContributors() { if(model =3D=3D null) return; - for (int i =3D 0; i < CONTRIBUTORS.length; i++) { - String nature =3D CONTRIBUTORS[i][1]; + ModelNatureExtension[] es =3D ModelNatureExtension.getInstances(); + for (int i =3D 0; i < es.length; i++) { + String nature =3D es[i].getName(); if(EclipseResourceUtil.hasNature(model, nature)) { if(contributors.containsKey(nature)) { continue; } else { - Object watcher =3D ModelFeatureFactory.getInstance().createFeat= ureInstance(CONTRIBUTORS[i][0]); + String contributorName =3D es[i].getWatcherContributor(); + Object watcher =3D ModelFeatureFactory.getInstance().createFeat= ureInstance(contributorName); if(watcher instanceof IWatcherContributor) { IWatcherContributor c =3D (IWatcherContributor)watcher; c.init(model); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/util/EclipseResourceUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/EclipseResourceUtil.java 2009-09-16 12:21:18 UTC (rev 1761= 1) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/EclipseResourceUtil.java 2009-09-16 13:10:17 UTC (rev 1761= 2) @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.jdt.core.*; import org.eclipse.jdt.ui.PreferenceConstants; @@ -41,6 +40,7 @@ import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.project.ModelNature; +import org.jboss.tools.common.model.project.ModelNatureExtension; = public class EclipseResourceUtil { = @@ -185,14 +185,11 @@ private static String[] MODEL_NATURES =3D new String[0]; = static { - List natures =3D new ArrayList(); - if(Platform.getBundle("org.jboss.tools.struts") !=3D null) { //$NON-NLS-= 1$ - natures.add("org.jboss.tools.struts.strutsnature"); //$NON-NLS-1$ + ModelNatureExtension[] es =3D ModelNatureExtension.getInstances(); + MODEL_NATURES =3D new String[es.length]; + for (int i =3D 0; i < es.length; i++) { + MODEL_NATURES[i] =3D es[i].getName(); } - if(Platform.getBundle("org.jboss.tools.jsf") !=3D null) { //$NON-NLS-1$ - natures.add("org.jboss.tools.jsf.jsfnature"); //$NON-NLS-1$ - } - MODEL_NATURES =3D natures.toArray(new String[0]); } = public static String[] getModelNatureNames() { @@ -275,7 +272,7 @@ static Map models =3D new HashMap(); = /** - * If project has no struts nature, the method creates new instance of mo= del = + * If project has no model nature, the method creates new instance of mod= el = * populates it with a filesystems corresponding to the project root * and links, and returns model object for the resource. = * The model created is not complete project, so it has property = Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/jst/web/tld/FilePathEncoderFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/FilePathEncoderFactory.java 2009-09-16 12:21:18 UTC (rev 17611) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/FilePathEncoderFactory.java 2009-09-16 13:10:17 UTC (rev 17612) @@ -12,26 +12,22 @@ = import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ModelFeatureFactory; +import org.jboss.tools.common.model.project.ModelNatureExtension; = public class FilePathEncoderFactory { - static IFilePathEncoder jsfEncoder =3D null; = - static { - try { - jsfEncoder =3D (IFilePathEncoder)ModelFeatureFactory.getInstance().crea= teFeatureInstance("org.jboss.tools.jsf.model.helpers.pages.FilePathEncoder"= ); //$NON-NLS-1$ - } catch (ClassCastException e) { - ModelPlugin.getPluginLog().logError(e); - } - } - public static IFilePathEncoder getEncoder(IProject project) { if(project =3D=3D null || !project.isOpen()) return null; - try { - if(project.hasNature("org.jboss.tools.jsf.jsfnature")) return jsfEncode= r; //$NON-NLS-1$ - } catch (CoreException e) { - //ignore - all checks are done above + ModelNatureExtension[] es =3D ModelNatureExtension.getInstances(); + for (int i =3D 0; i < es.length; i++) { + try { + if(project.hasNature(es[i].getName())) { + IFilePathEncoder encoder =3D es[i].getPathEncoder(); + if(encoder !=3D null) return encoder; + } + } catch (CoreException e) { + //ignore - all checks are done above + } } return null; } --===============3186437833403060062==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 09:22:06 2009 Content-Type: multipart/mixed; boundary="===============8463752173585624643==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17613 - trunk/jsf/plugins/org.jboss.tools.jsf. Date: Wed, 16 Sep 2009 09:22:05 -0400 Message-ID: <200909161322.n8GDM5Dg029855@svn01.web.mwc.hst.phx2.redhat.com> --===============8463752173585624643== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-16 09:22:05 -0400 (Wed, 16 Sep 2009) New Revision: 17613 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4893 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-16 13:10:17 UT= C (rev 17612) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-16 13:22:05 UT= C (rev 17613) @@ -437,4 +437,13 @@ resolver-class=3D"org.jboss.tools.jsf.model.JSFMessageELComplet= ionEngine"/> + + + --===============8463752173585624643==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 09:22:38 2009 Content-Type: multipart/mixed; boundary="===============0855759748367725884==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17614 - trunk/struts/plugins/org.jboss.tools.struts. Date: Wed, 16 Sep 2009 09:22:38 -0400 Message-ID: <200909161322.n8GDMciq029901@svn01.web.mwc.hst.phx2.redhat.com> --===============0855759748367725884== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-16 09:22:38 -0400 (Wed, 16 Sep 2009) New Revision: 17614 Modified: trunk/struts/plugins/org.jboss.tools.struts/plugin.xml Log: Modified: trunk/struts/plugins/org.jboss.tools.struts/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-16 13:22= :05 UTC (rev 17613) +++ trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-16 13:22= :38 UTC (rev 17614) @@ -392,4 +392,12 @@ = = + + + \ No newline at end of file --===============0855759748367725884==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 11:01:57 2009 Content-Type: multipart/mixed; boundary="===============1283124746079020600==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17615 - trunk/common/plugins/org.jboss.tools.common.model/resources/meta. Date: Wed, 16 Sep 2009 11:01:57 -0400 Message-ID: <200909161501.n8GF1vR9016771@svn01.web.mwc.hst.phx2.redhat.com> --===============1283124746079020600== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-16 11:01:57 -0400 (Wed, 16 Sep 2009) New Revision: 17615 Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/options= _general.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4885 options and palette split to jsf struts and jboss Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/= options_general.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/option= s_general.xml 2009-09-16 13:22:38 UTC (rev 17614) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/option= s_general.xml 2009-09-16 15:01:57 UTC (rev 17615) @@ -2,8 +2,6 @@ - \ No newline at end of file --===============1283124746079020600==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 11:03:11 2009 Content-Type: multipart/mixed; boundary="===============5568793991908270793==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17616 - in trunk/jsf/plugins/org.jboss.tools.jsf: resources/meta and 1 other directory. Date: Wed, 16 Sep 2009 11:03:10 -0400 Message-ID: <200909161503.n8GF3AUc017004@svn01.web.mwc.hst.phx2.redhat.com> --===============5568793991908270793== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-16 11:03:10 -0400 (Wed, 16 Sep 2009) New Revision: 17616 Added: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-options.xml trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4885 options and palette split to jsf struts and jboss Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-16 15:01:57 UT= C (rev 17615) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-16 15:03:10 UT= C (rev 17616) @@ -446,4 +446,15 @@ pathEncoder=3D"org.jboss.tools.jsf.model.helpers.pages.FilePathEnco= der" /> + + + + + + + + Added: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-options.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-options.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-options.xml 20= 09-09-16 15:03:10 UTC (rev 17616) @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/j= sf-options.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf-palette.xml 20= 09-09-16 15:03:10 UTC (rev 17616) @@ -0,0 +1,1508 @@ + + + + + + Name:</b= > <code> View</code> \nSyntax:= <code><f:view></code> <code></f:= view></code> Attributes: <code>locale= </code>" + ENDTEXT=3D"</view>" ICON=3D"" NAME=3D"view" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<view>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Name:</b= > <code> Action Listener</code> \nSyn= tax: <code><f:actionListener/></code><b= r>Attributes: <code>type</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"actionListener" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<actionListener type=3D"|"/>" large-icon=3D= "" + model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Validate Double Range</code> \n<b= >Syntax: <code><f:validateDoubleRange/></c= ode> Attributes: <code>maximum, minimum</cod= e>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/validator" NAME=3D"validateDoub= leRange" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateDoubleRan= ge |/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Convert Number</code> \nSynt= ax: <code><f:convertNumber/></code> = Attributes: <code>currencyCode, currencySymbol, group= ingUsed, integerOnly, locale, maxFractionDigits, maxIntegerDigits, minFract= ionDigits, minIntegerDigits, pattern, type</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/convertNumber" NAME=3D"convertN= umber" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<convertNumber/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Converter</code> \nSyntax:&l= t;/b> <code><f:converter/></code> Att= ributes: <code>converterId</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/converter" NAME=3D"converter" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<converter convert= erId=3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Subview</code> \nSyntax:<= /b> <code><f:subview></code> <code>&= lt;/f:subview></code> Attributes: <co= de>id, binding, rendered</code>" + ENDTEXT=3D"</subview>" ICON=3D"" NAME=3D"subview" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<subview id=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Validate Long Range</code> Sy= ntax: <code><f:validateLongRange/></code>&= lt;br>Attributes: <code>maximum, minimum</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/validator" NAME=3D"validateLong= Range" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateLongRange= |/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Attribute</code> \nSyntax:&l= t;/b> <code><f:attribute/></code> Att= ributes: <code>name, value</co= de>" + ENDTEXT=3D"" ICON=3D"%Icons%/jstl/attr" NAME=3D"attribute" REFORMAT= =3D"no" + SCOPE=3D"project" STARTTEXT=3D"<attribute name=3D"|" val= ue=3D""/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Facet</code> \nSyntax:</b= > <code><f:facet></code> <code></= f:facet></code> Attributes: <code><= ;b>name</code>" + ENDTEXT=3D"</facet>" ICON=3D"" NAME=3D"facet" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<facet name=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Load Bundle</code> \nSyntax:= <code><f:loadBundle/></code> = Attributes: <code>basename, var&l= t;/code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/bundle" NAME=3D"loadBundle" + REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<loadBundle basename=3D"|" var=3D"&quo= t;/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Validate Length</code> Syntax= : <code><f:validateLength/></code> &= lt;b>Attributes: <code>maximum, minimum</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/validator" NAME=3D"validateLeng= th" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateLength |/= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Value Change Listener</code> \n<= ;b>Syntax: <code><f:valueChangeListener/><= /code> Attributes: <code>type</= code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"valueChangeListener" REFORMAT=3D"no" S= COPE=3D"project" + STARTTEXT=3D"<valueChangeListener type=3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><f:setPrope= rtyActionListener /></code> Attributes: = <code>value, target</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"setPropertyActionListener" REFORMAT=3D= "no" + SCOPE=3D"project" + STARTTEXT=3D"<setPropertyActionListener value=3D"|" targ= et=3D""/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Convert Date Time</code> \nS= yntax: <code><f:convertDateTime/></code>&l= t;br>Attributes: <code>dateStyle, locale, pattern, ti= meStyle, timeZone, type</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/convertDateTime" NAME=3D"conver= tDateTime" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<convertDateTime/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Validator</code> \nSyntax:&l= t;/b> <code><f:validator/></code> Att= ributes: <code>validatorId</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/validator" NAME=3D"validator" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<validator validato= rId=3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><f:phaseLis= tener /></code> Attributes: <code>typ= e, binding</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"phaseListener" REFORMAT=3D"no" SCOPE= =3D"project" + STARTTEXT=3D"<phaseListener type=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Select Item</code> \nSyntax:= <code><f:selectItem/></code> = Attributes: <code>binding, id, itemDescription, itemDisable= d, itemLabel, itemValue, value</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/option" NAME=3D"selectItem" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<selectItem/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Verbatim</code> Syntax:</b= > <code><f:verbatim></code> <code>&l= t;/f:verbatim></code> Attributes: <co= de>escape</code>" + ENDTEXT=3D"</verbatim>" ICON=3D"" NAME=3D"verbatim" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<verbatim>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><%@ taglib = uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %&= ;gt;</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"JSF Core t= aglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://java.sun.com/jsf/core&q= uot; prefix=3D"f" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Select Items</code> \nSyntax= : <code><f:selectItems/></code> <= b>Attributes: <code>binding, id, value</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/options" NAME=3D"selectItems" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<selectItems/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Parameter</code> \nSyntax:&l= t;/b> <code><f:param></code> <code>&= lt;/f:param></code> Attributes: <code= >value, binding, id, name</code>" + ENDTEXT=3D"</param>" ICON=3D"%Icons%/Struts Bean/parameter" NAME= =3D"param" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<param value=3D&qu= ot;|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + Syntax: <code><h:selectOn= eMenu></code> <code></h:selectOneMenu><= /code> Attributes: <code>converter, converterMe= ssage, id, immediate, rendered, required, requiredMessage, validator, valid= atorMessage, value, valueChangeListener, accesskey, dir, disabled, disabled= Class, enabledClass, label, lang, onblur, onchange, onclick, ondblclick, on= focus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout= , onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, = title, binding</code>" + ENDTEXT=3D"</selectOneMenu>" ICON=3D"%Icons%/Struts HTML/select" + NAME=3D"selectOneMenu" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<selectOneMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:selectMa= nyListbox></code> <code></h:selectManyListbox&= ;gt;</code> Attributes: <code>converter, con= verterMessage, id, immediate, rendered, required, requiredMessage, validato= r, validatorMessage, value, valueChangeListener, accesskey, dir, disabled, = disabledClass, enabledClass, label, lang, onblur, onchange, onclick, ondblc= lick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, on= mouseout, onmouseover, onmouseup, onselect, readonly, size, style, styleCla= ss, tabindex, title, binding</code>" + ENDTEXT=3D"</selectManyListbox>" ICON=3D"%Icons%/Struts HTML/selec= t" + NAME=3D"selectManyListbox" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<selectManyListbox>" large-icon=3D"" model-entity=3D"= SharableMacroHTML" /> + Syntax: <code><h:form&= ;gt;</code> <code></h:form></code> <b= >Attributes: <code>id, prependId, rendered, accept, acceptc= harset, dir, enctype, lang, onclick, ondblclick, onkeydown, onkeypress, onk= eyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onreset= , onsubmit, style, styleClass, target, title, binding</code>" + ENDTEXT=3D"</form>" ICON=3D"%Icons%/Struts HTML/form" NAME=3D"form" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<form>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:column&a= mp;gt;</code> <code></h:column></code> &= lt;b>Attributes: <code>rendered, binding, id, footerClass, = headerClass</code>" + ENDTEXT=3D"</column>" ICON=3D"" NAME=3D"column" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<column>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><h:graphicI= mage/></code> Attributes: <code>id, r= endered, url, value, alt, dir, height, ismap, lang, longdesc, onclick, ondb= lclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseou= t, onmouseover, onmouseup, style, styleClass, title, usemap, width, binding= </code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/img" NAME=3D"graphicImage" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<graphicImage valu= e=3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:message/= ></code> Attributes: <code>for&= lt;/b>, id, rendered, showDetail, showSummary, dir, errorClass, errorStyle,= fatalClass, fatalStyle, infoClass, infoStyle, lang, style, styleClass, tit= le, tooltip, warnClass, warnStyle, binding</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Logic/messages" NAME=3D"message" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<message for=3D&qu= ot;|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:outputFo= rmat></code> <code></h:outputFormat></c= ode> Attributes: <code>converter, id, rendered,= value, dir, escape, lang, style, styleClass, title, binding</code>" + ENDTEXT=3D"</outputFormat>" ICON=3D"" NAME=3D"outputFormat" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputFormat>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:selectMa= nyMenu></code> <code></h:selectManyMenu>&l= t;/code> Attributes: <code>converter, converter= Message, id, immediate, rendered, required, requiredMessage, validator, val= idatorMessage, value, valueChangeListener, accesskey, dir, disabled, disabl= edClass, enabledClass, label, lang, onblur, onchange, onclick, ondblclick, = onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseo= ut, onmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex= , title, binding</code>" + ENDTEXT=3D"</selectManyMenu>" ICON=3D"%Icons%/Struts HTML/select" + NAME=3D"selectManyMenu" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<selectManyMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:selectOn= eRadio></code> <code></h:selectOneRadio>&l= t;/code> Attributes: <code>converter, converter= Message, id, immediate, rendered, required, requiredMessage, validator, val= idatorMessage, value, valueChangeListener, accesskey, border, dir, disabled= , disabledClass, enabledClass, label, lang, layout, onblur, onchange, oncli= ck, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmou= semove, onmouseout, onmouseover, onmouseup, onselect, readonly, style, styl= eClass, tabindex, title, binding</code>" + ENDTEXT=3D"</selectOneRadio>" ICON=3D"%Icons%/Struts HTML/radio" + NAME=3D"selectOneRadio" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<selectOneRadio>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:selectOn= eListbox></code> <code></h:selectOneListbox&g= t;</code> Attributes: <code>converter, conve= rterMessage, id, immediate, rendered, required, requiredMessage, validator,= validatorMessage, value, valueChangeListener, accesskey, dir, disabled, di= sabledClass, enabledClass, label, lang, onblur, onchange, onclick, ondblcli= ck, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmo= useout, onmouseover, onmouseup, onselect, readonly, size, style, styleClass= , tabindex, title, binding</code>" + ENDTEXT=3D"</selectOneListbox>" ICON=3D"%Icons%/Struts HTML/select" + NAME=3D"selectOneListbox" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<selectOneListbox>" large-icon=3D"" model-entity=3D"S= harableMacroHTML" /> + Syntax: <code><h:panelGro= up></code> <code></h:panelGroup></code>= Attributes: <code>id, rendered, layout, style,= styleClass, binding</code>" + ENDTEXT=3D"</panelGroup>" ICON=3D"" NAME=3D"panelGroup" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelGroup>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:commandB= utton/></code> Attributes: <code>acti= on, actionListener, id, immediate, rendered, value, accesskey, alt, dir, di= sabled, image, label, lang, onblur, onchange, onclick, ondblclick, onfocus,= onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmo= useover, onmouseup, onselect, readonly, style, styleClass, tabindex, title,= type, binding</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/button" NAME=3D"commandButto= n" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<commandButton value=3D"|" action=3D"&= quot;/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:inputTex= t/></code> Attributes: <code>converte= r, converterMessage, id, immediate, rendered, required, requiredMessage, va= lidator, validatorMessage, value, valueChangeListener, accesskey, alt, auto= complete, dir, disabled, label, lang, maxlength, onblur, onchange, onclick,= ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousem= ove, onmouseout, onmouseover, onmouseup, onselect, readonly, size, style, s= tyleClass, tabindex, title, binding</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/text" NAME=3D"inputText" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputText value= =3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:dataTabl= e></code> <code></h:dataTable></code>&l= t;br>Attributes: <code>first, id, rendered, rows, val= ue, var, bgcolor, border, captionClass, captionStyle, cellpadding, cellspac= ing, columnClasses, dir, footerClass, frame, headerClass, lang, onclick, on= dblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouse= out, onmouseover, onmouseup, rowClasses, rules, style, styleClass, summary,= title, width, binding</code>" + ENDTEXT=3D"</dataTable>" ICON=3D"%Icons%/Tables/table" NAME=3D"dat= aTable" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<dataTable value=3D"|" var=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:selectBo= oleanCheckbox/></code> Attributes: <c= ode>converter, converterMessage, id, immediate, rendered, required, require= dMessage, validator, validatorMessage, value, valueChangeListener, accesske= y, dir, disabled, label, lang, onblur, onchange, onclick, ondblclick, onfoc= us, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, o= nmouseover, onmouseup, onselect, readonly, style, styleClass, tabindex, tit= le, binding</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/checkbox" NAME=3D"selectBool= eanCheckbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectBooleanChec= kbox/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:outputTe= xt/></code> Attributes: <code>convert= er, id, rendered, value, dir, escape, lang, style, styleClass, title, bindi= ng</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JSF Core/write" NAME=3D"outputText" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<outputText/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:selectMa= nyCheckbox></code> <code></h:selectManyCheckbox&a= mp;gt;</code> Attributes: <code>converter, c= onverterMessage, id, immediate, rendered, required, requiredMessage, valida= tor, validatorMessage, value, valueChangeListener, accesskey, border, dir, = disabled, disabledClass, enabledClass, label, lang, layout, onblur, onchang= e, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedow= n, onmousemove, onmouseout, onmouseover, onmouseup, onselect, readonly, sty= le, styleClass, tabindex, title, binding</code>" + ENDTEXT=3D"</selectManyCheckbox>" ICON=3D"%Icons%/Struts HTML/mult= ibox" + NAME=3D"selectManyCheckbox" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<selectManyCheckbox>" large-icon=3D"" model-entity=3D= "SharableMacroHTML" /> + Syntax: <code><h:inputSec= ret/></code> Attributes: <code>conver= ter, converterMessage, id, immediate, rendered, required, requiredMessage, = validator, validatorMessage, value, valueChangeListener, accesskey, alt, au= tocomplete, dir, disabled, label, lang, maxlength, onblur, onchange, onclic= k, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmous= emove, onmouseout, onmouseover, onmouseup, onselect, readonly, redisplay, s= ize, style, styleClass, tabindex, title, binding</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/password" NAME=3D"inputSecre= t" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputSecret value= =3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:panelGri= d></code> <code></h:panelGrid></code>&l= t;br>Attributes: <code>id, rendered, bgcolor, border,= captionClass, captionStyle, cellpadding, cellspacing, columnClasses, colum= ns, dir, footerClass, frame, headerClass, lang, onclick, ondblclick, onkeyd= own, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover= , onmouseup, rowClasses, rules, style, styleClass, summary, title, width, b= inding</code>" + ENDTEXT=3D"</panelGrid>" ICON=3D"%Icons%/Tables/table" NAME=3D"pan= elGrid" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelGrid columns= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:commandL= ink></code> <code></h:commandLink></cod= e> Attributes: <code>action, actionListener, id= , immediate, rendered, value, accesskey, charset, coords, dir, disabled, hr= eflang, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, = onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rel,= rev, shape, style, styleClass, tabindex, target, title, type, binding</= code>" + ENDTEXT=3D"</commandLink>" ICON=3D"%Icons%/Struts HTML/link" NAME= =3D"commandLink" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandLink value= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:inputHid= den/></code> Attributes: <code>conver= ter, converterMessage, id, immediate, rendered, required, requiredMessage, = validator, validatorMessage, value, valueChangeListener, binding</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/hidden" NAME=3D"inputHidden" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputHidden/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><%@ taglib = uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %&= ;gt;</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"JSF HTML t= aglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://java.sun.com/jsf/html&q= uot; prefix=3D"h" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:outputLa= bel></code> <code></h:outputLabel></cod= e> Attributes: <code>converter, id, rendered, v= alue, accesskey, dir, escape, for, lang, onblur, onclick, ondblclick, onfoc= us, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, o= nmouseover, onmouseup, style, styleClass, tabindex, title, binding</code= >" + ENDTEXT=3D"</outputLabel>" ICON=3D"%Icons%/JSF Core/write" NAME=3D= "outputLabel" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<outputLabel for= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:inputTex= tarea></code> <code></h:inputTextarea><= /code> Attributes: <code>converter, converterMe= ssage, id, immediate, rendered, required, requiredMessage, validator, valid= atorMessage, value, valueChangeListener, accesskey, cols, dir, disabled, la= bel, lang, onblur, onchange, onclick, ondblclick, onfocus, onkeydown, onkey= press, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseu= p, onselect, readonly, rows, style, styleClass, tabindex, title, binding<= ;/code>" + ENDTEXT=3D"</inputTextarea>" ICON=3D"%Icons%/Struts HTML/textarea" + NAME=3D"inputTextarea" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<inputTextarea>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:outputLi= nk></code> <code></h:outputLink></code>= Attributes: <code>converter, id, rendered, val= ue, accesskey, charset, coords, dir, disabled, hreflang, lang, onblur, oncl= ick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmo= usemove, onmouseout, onmouseover, onmouseup, rel, rev, shape, style, styleC= lass, tabindex, target, title, type, binding</code>" + ENDTEXT=3D"</outputLink>" ICON=3D"%Icons%/Common/a" NAME=3D"output= Link" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<outputLink value= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><h:messages= /></code> Attributes: <code>globalOnl= y, id, rendered, showDetail, showSummary, dir, errorClass, errorStyle, fata= lClass, fatalStyle, infoClass, infoStyle, lang, layout, style, styleClass, = title, tooltip, warnClass, warnStyle, binding</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Logic/messages" NAME=3D"messages" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<messages/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + Syntax: <code>&am= p;lt;ui:debug></code> <code></ui:debug><= ;/code> Attributes: <code>hotkey, rendered</= code>" + ENDTEXT=3D"</debug>" ICON=3D"" NAME=3D"debug" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<debug>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><ui:component></c= ode> <code></ui:component></code> Att= ributes: <code>id, binding</code>" + ENDTEXT=3D"</component>" ICON=3D"" NAME=3D"component" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<component>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><ui:composi= tion></code> <code></ui:composition></c= ode> Attributes: <code>template</code>" + ENDTEXT=3D"</composition>" ICON=3D"" NAME=3D"composition" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<composition>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax:<= ;/b> <code><ui:define></code> <code>&= ;lt;/ui:define></code> Attributes: <c= ode>name</code>" + ENDTEXT=3D"</define>" ICON=3D"" NAME=3D"define" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<define name=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><ui:repeat&= amp;gt;</code> <code></ui:repeat></code><br= >Attributes: <code>value, var</= b>, offset, size, varStatus</code>" + ENDTEXT=3D"</repeat>" ICON=3D"" NAME=3D"repeat" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<repeat value=3D"|" var=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax:<b= r><code><ui:fragment></code> <code></ui= :fragment></code> Attributes: <code>i= d, binding</code>" + ENDTEXT=3D"</fragment>" ICON=3D"" NAME=3D"fragment" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<fragment>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><ui:decorate></= code> <code></ui:decorate></code> Att= ributes: <code>template</code>" + ENDTEXT=3D"</decorate>" ICON=3D"" NAME=3D"decorate" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<decorate template=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax:<= /b> <code><ui:include></code> <code>&= ;lt;/ui:include></code> Attributes: <= code>src</code>" + ENDTEXT=3D"</include>" ICON=3D"" NAME=3D"include" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<include src=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><ui:param&a= mp;gt;</code> <code></ui:param></code> &= lt;b>Attributes: <code>name, value</b= ></code>" + ENDTEXT=3D"</param>" ICON=3D"" NAME=3D"param" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<param name=3D"|" value=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code>&= lt;ui:insert></code> <code></ui:insert><= ;/code> Attributes: <code>name</code>" + ENDTEXT=3D"</insert>" ICON=3D"" NAME=3D"insert" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<insert>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + S= yntax: <code><ui:remove></code> <= code></ui:remove></code> Attributes:<= ;br><code></code>" + ENDTEXT=3D"</remove>" ICON=3D"" NAME=3D"remove" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<remove>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + + + + + Syntax: <code><t:treeChec= kbox /></code> Attributes: <code><= b>for, binding, itemDisabled, id, itemDescription, itemLabel, itemVa= lue, value</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"treeCheckbox" REFORMAT=3D"no" SCOPE=3D= "project" + STARTTEXT=3D"<treeCheckbox for=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:jsValueS= et /></code> Attributes: <code>= name, value</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"jsValueSet" REFORMAT=3D"no" SCOPE=3D"p= roject" + STARTTEXT=3D"<jsValueSet name=3D"|" value=3D""= />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectMa= nyListbox></code> <code></t:selectManyListbox&= ;gt;</code> Attributes: <code>id, rendered, = binding, value, converter, immediate, required, validator, valueChangeListe= ner, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown,= onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, on= keyup, datafld, datasrc, dataformatas, disabled, onblur, onchange, onfocus,= tabindex, readonly, size, enabledClass, disabledClass, enabledOnUserRole, = visibleOnUserRole, forceId, forceIdIndex, displayValueOnly, displayValueOnl= yStyle, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectManyListbox>" ICON=3D"" NAME=3D"selectManyListb= ox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectManyListbox= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelSta= ck></code> <code></t:panelStack></code>= Attributes: <code>selectedPanel, = id</code>" + ENDTEXT=3D"</panelStack>" ICON=3D"" NAME=3D"panelStack" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelStack selectedPanel=3D"|= ">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:tree&= ;gt;</code> <code></t:tree></code> <b= >Attributes: <code>value, id, var, styleClass,= nodeClass, selectedNodeClass, headerClass, footerClass, rowClasses, column= Classes, iconClass, iconLine, iconNoline, iconChildFirst, iconChildMiddle, = iconChildLast, iconNodeOpen, iconNodeOpenFirst, iconNodeOpenMiddle, iconNod= eOpenLast, iconNodeClose, iconNodeCloseFirst, iconNodeCloseMiddle, iconNode= CloseLast, expandRoot, expireListeners</code>" + ENDTEXT=3D"</tree>" ICON=3D"" NAME=3D"tree" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<tree value=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:dataScro= ller></code> <code></t:dataScroller></c= ode> Attributes: <code>id, rendered, binding, e= nabledOnUserRole, visibleOnUserRole, for, fastStep, pageIndexVar, pageCount= Var, rowsCountVar, displayedRowsCountVar, firstRowIndexVar, lastRowIndexVar= , styleClass, style, paginator, paginatorMaxPages, paginatorTableClass, pag= inatorTableStyle, paginatorColumnClass, paginatorColumnStyle, paginatorActi= veColumnClass, paginatorActiveColumnStyle, renderFacetsIfSinglePage, immedi= ate, actionListener</code>" + ENDTEXT=3D"</dataScroller>" ICON=3D"" NAME=3D"dataScroller" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<dataScroller>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:validate= Equal></code> <code></t:validateEqual><= /code> Attributes: <code>for</c= ode>" + ENDTEXT=3D"</validateEqual>" ICON=3D"" NAME=3D"validateEqual" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateEqual for= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:columns&= amp;gt;</code> <code></t:columns></code><br= >Attributes: <code>value, var</= b>, id, rendered, binding, dir, lang, style, title, styleClass, onclick, on= dblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onk= eypress, onkeydown, onkeyup, headerdir, headerlang, headerstyle, headertitl= e, headerstyleClass, headeronclick, headerondblclick, headeronmousedown, he= aderonmouseup, headeronmouseover, headeronmousemove, headeronmouseout, head= eronkeypress, headeronkeydown, headeronkeyup, footerdir, footerlang, footer= style, footertitle, footerstyleClass, footeronclick, footerondblclick, foot= eronmousedown, footeronmouseup, footeronmouseover, footeronmousemove, foote= ronmouseout, footeronkeypress, footeronkeydown, footeronkeyup, width</co= de>" + ENDTEXT=3D"</columns>" ICON=3D"" NAME=3D"columns" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<columns value=3D"|" var= =3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:aliasBea= n></code> <code></t:aliasBean></code>&l= t;br>Attributes: <code>id, alias, value</code>" + ENDTEXT=3D"</aliasBean>" ICON=3D"" NAME=3D"aliasBean" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<aliasBean>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:swapImag= e></code> <code></t:swapImage></code>&l= t;br>Attributes: <code>swapImageUrl, act= iveImageUrl, id, rendered, binding, url, value, dir, lang, style, title, st= yleClass, align, border, hspace, vspace, alt, height, ismap, longdesc, usem= ap, width, onclick, ondblclick, onkeypress, onkeydown, onkeyup</code>" + ENDTEXT=3D"</swapImage>" ICON=3D"" NAME=3D"swapImage" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<swapImage swapImageUrl=3D"|&q= uot;>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectOn= eLanguage></code> <code></t:selectOneLanguage&= ;gt;</code> Attributes: <code>maxLength, id,= rendered, binding, value, converter, immediate, required, validator, value= ChangeListener, dir, lang, style, title, styleClass, onclick, ondblclick, o= nmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, on= keydown, onkeyup, datafld, datasrc, dataformatas, disabled, onblur, onchang= e, onfocus, tabindex, readonly, enabledClass, disabledClass, enabledOnUserR= ole, visibleOnUserRole, forceId, forceIdIndex, displayValueOnly, displayVal= ueOnlyStyle, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectOneLanguage>" ICON=3D"" NAME=3D"selectOneLangua= ge" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneLanguage= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:jsValueC= hangeListener /></code> Attributes: <= code>expressionValue, for, property</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"jsValueChangeListener" REFORMAT=3D"no" + SCOPE=3D"project" STARTTEXT=3D"<jsValueChangeListener expressionVa= lue=3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectOn= eRadio></code> <code></t:selectOneRadio>&l= t;/code> Attributes: <code>id, rendered, bindin= g, value, converter, immediate, required, validator, valueChangeListener, d= ir, lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmou= seup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup,= accesskey, alt, datafld, datasrc, dataformatas, disabled, onblur, onchange= , onfocus, onselect, readonly, tabindex, layout, border, enabledClass, disa= bledClass, enabledOnUserRole, visibleOnUserRole, forceId, forceIdIndex, dis= playValueOnly, displayValueOnlyStyle, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectOneRadio>" ICON=3D"" NAME=3D"selectOneRadio" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneRadio>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectOn= eListbox></code> <code></t:selectOneListbox&g= t;</code> Attributes: <code>id, rendered, bi= nding, value, converter, immediate, required, validator, valueChangeListene= r, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown, o= nmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onke= yup, datafld, datasrc, dataformatas, disabled, onblur, onchange, onfocus, t= abindex, readonly, size, enabledClass, disabledClass, enabledOnUserRole, vi= sibleOnUserRole, forceId, forceIdIndex, displayValueOnly, displayValueOnlyS= tyle, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectOneListbox>" ICON=3D"" NAME=3D"selectOneListbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneListbox>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:tree2&am= p;gt;</code> <code></t:tree2></code> <= ;b>Attributes: <code>value, var, varNodeToggle= r, showNav, showLines, clientSideToggle, showRootNode, preserveToggle, java= scriptLocation, imageLocation, styleLocation, id, rendered, binding</cod= e>" + ENDTEXT=3D"</tree2>" ICON=3D"" NAME=3D"tree2" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<tree2 value=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:commandB= utton></code> <code></t:commandButton><= /code> Attributes: <code>id, rendered, binding,= action, actionListener, immediate, value, dir, lang, style, title, styleCl= ass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove,= onmouseout, onkeypress, onkeydown, onkeyup, accesskey, alt, disabled, onbl= ur, onchange, onfocus, onselect, size, tabindex, type, image, enabledOnUser= Role, visibleOnUserRole, forceId, forceIdIndex</code>" + ENDTEXT=3D"</commandButton>" ICON=3D"" NAME=3D"commandButton" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandButton>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:treeColu= mn></code> <code></t:treeColumn></code>= Attributes: <code>id, rendered, binding</co= de>" + ENDTEXT=3D"</treeColumn>" ICON=3D"" NAME=3D"treeColumn" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<treeColumn>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelTab= bedPane></code> <code></t:panelTabbedPane>= </code> Attributes: <code>id, rendered, bind= ing, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown,= onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, on= keyup, align, border, bgcolor, cellpadding, cellspacing, datafld, datasrc, = dataformatas, frame, rules, summary, width, enabledOnUserRole, visibleOnUse= rRole, selectedIndex, activeTabStyleClass, inactiveTabStyleClass, disabledT= abStyleClass, activeSubStyleClass, inactiveSubStyleClass, tabContentStyleCl= ass</code>" + ENDTEXT=3D"</panelTabbedPane>" ICON=3D"" NAME=3D"panelTabbedPane" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelTabbedPane>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:treeSele= ctionListener /></code> Attributes: <= code>type</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"treeSelectionListener" REFORMAT=3D"no" + SCOPE=3D"project" STARTTEXT=3D"<treeSelectionListener type=3D"= ;|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> taglib</code> \nSyntax:= <code><%@ taglib uri=3D"http://myfaces.apache.org/tom= ahawk" prefix=3D"t" %></code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"MyFaces To= mahawk taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://myfaces.apache.org/toma= hawk" prefix=3D"t"%>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelTab= ></code> <code></t:panelTab></code><= br>Attributes: <code>id, rendered, binding, dir, lang= , style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, on= mouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, enabled= OnUserRole, visibleOnUserRole, label</code>" + ENDTEXT=3D"</panelTab>" ICON=3D"" NAME=3D"panelTab" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<panelTab>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:commandS= ortHeader></code> <code></t:commandSortHeader&= ;gt;</code> Attributes: <code>columnNa= me, id, rendered, binding, action, actionListener, immediate, value,= dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown, onm= ouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyu= p, accesskey, charset, coords, hreflang, rel, rev, shape, tabindex, type, o= nblur, onfocus, target, enabledOnUserRole, visibleOnUserRole, arrow</cod= e>" + ENDTEXT=3D"</commandSortHeader>" ICON=3D"" NAME=3D"commandSortHead= er" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<commandSortHeader columnName=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:validate= CreditCard></code> <code></t:validateCreditCard&a= mp;gt;</code> Attributes: <code>none, amex, = visa, mastercard, discover</code>" + ENDTEXT=3D"</validateCreditCard>" ICON=3D"" NAME=3D"validateCredit= Card" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateCreditCar= d>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputFil= eUpload></code> <code></t:inputFileUpload>= </code> Attributes: <code>id, rendered, bind= ing, value, converter, immediate, required, validator, valueChangeListener,= dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown, onm= ouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyu= p, accesskey, align, alt, disabled, maxlength, onblur, onchange, onfocus, o= nselect, readonly, size, tabindex, accept, storage</code>" + ENDTEXT=3D"</inputFileUpload>" ICON=3D"" NAME=3D"inputFileUpload" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputFileUpload>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputSec= ret></code> <code></t:inputSecret></cod= e> Attributes: <code>datafld, datasrc, dataform= atas, id, rendered, binding, value, converter, immediate, required, validat= or, valueChangeListener, accesskey, align, alt, disabled, maxlength, onblur= , onchange, onfocus, onselect, readonly, size, tabindex, dir, lang, style, = title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseover= , onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, enabledOnUserRol= e, visibleOnUserRole, forceId, forceIdIndex, displayValueOnly, displayValue= OnlyStyle, displayValueOnlyStyleClass, redisplay</code>" + ENDTEXT=3D"</inputSecret>" ICON=3D"" NAME=3D"inputSecret" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<inputSecret>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:checkbox= ></code> <code></t:checkbox></code><= br>Attributes: <code>for, index<= ;/b>, id, rendered, binding, enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</checkbox>" ICON=3D"" NAME=3D"checkbox" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<checkbox for=3D"|" index= =3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:buffer&a= mp;gt;</code> <code></t:buffer></code> &= lt;b>Attributes: <code>into</code>" + ENDTEXT=3D"</buffer>" ICON=3D"" NAME=3D"buffer" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<buffer into=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:navigati= onMenuItems /></code> Attributes: <co= de>binding, id, value</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"navigationMenuItems" REFORMAT=3D"no" S= COPE=3D"project" + STARTTEXT=3D"<navigationMenuItems/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:popup&am= p;gt;</code> <code></t:popup></code> <= ;b>Attributes: <code>displayAtDistanceX, displayAtDistanceY= , closePopupOnExitingElement, closePopupOnExitingPopup, id, rendered, bindi= ng, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown, = onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onk= eyup, enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</popup>" ICON=3D"" NAME=3D"popup" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<popup>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><t:inputCal= endar></code> <code></t:inputCalendar><= /code> Attributes: <code>id, rendered, binding,= value, converter, immediate, required, validator, valueChangeListener, onc= lick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouse= out, onkeypress, onkeydown, onkeyup, dir, lang, style, title, styleClass, a= ccesskey, align, alt, disabled, maxlength, onblur, onchange, onfocus, onsel= ect, readonly, size, tabindex, enabledOnUserRole, visibleOnUserRole, forceI= d, forceIdIndex, monthYearRowClass, weekRowClass, dayCellClass, currentDayC= ellClass, renderAsPopup, addResources, popupDateFormat, popupButtonString, = popupGotoString, popupTodayString, popupWeekString, popupScrollLeftMessage,= popupScrollRightMessage, popupSelectMonthMessage, popupSelectYearMessage, = popupSelectDateMessage, renderPopupButtonAsImage</code>" + ENDTEXT=3D"</inputCalendar>" ICON=3D"" NAME=3D"inputCalendar" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputCalendar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelGri= d></code> <code></t:panelGrid></code>&l= t;br>Attributes: <code>id, rendered, binding, dir, la= ng, style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, = onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, align= , border, bgcolor, cellpadding, cellspacing, datafld, datasrc, dataformatas= , frame, rules, summary, width, columnClasses, columns, footerClass, header= Class, rowClasses, enabledOnUserRole, visibleOnUserRole, forceId, forceIdIn= dex, displayValueOnly, displayValueOnlyStyle, displayValueOnlyStyleClass<= ;/code>" + ENDTEXT=3D"</panelGrid>" ICON=3D"" NAME=3D"panelGrid" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<panelGrid>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:radio&am= p;gt;</code> <code></t:radio></code> <= ;b>Attributes: <code>for, index, = id, rendered, binding, enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</radio>" ICON=3D"" NAME=3D"radio" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<radio for=3D"|" index=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:saveStat= e></code> <code></t:saveState></code>&l= t;br>Attributes: <code>value, id</cod= e>" + ENDTEXT=3D"</saveState>" ICON=3D"" NAME=3D"saveState" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<saveState value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:commandN= avigation2></code> <code></t:commandNavigation2&a= mp;gt;</code> Attributes: <code>id, rendered= , binding, action, actionListener, immediate, value, dir, lang, style, titl= e, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, on= mousemove, onmouseout, onkeypress, onkeydown, onkeyup, accesskey, charset, = coords, hreflang, rel, rev, shape, tabindex, type, onblur, onfocus, target,= enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</commandNavigation2>" ICON=3D"" NAME=3D"commandNavigat= ion2" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandNavigation= 2>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:validate= RegExpr></code> <code></t:validateRegExpr>= </code> Attributes: <code>pattern</= b></code>" + ENDTEXT=3D"</validateRegExpr>" ICON=3D"" NAME=3D"validateRegExpr" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateRegExpr p= attern=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputTex= tarea></code> <code></t:inputTextarea><= /code> Attributes: <code>id, rendered, binding,= value, converter, immediate, required, validator, valueChangeListener, acc= esskey, cols, datafld, datasrc, dataformatas, disabled, onblur, onchange, o= nfocus, onselect, readonly, rows, tabindex, dir, lang, style, title, styleC= lass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove= , onmouseout, onkeypress, onkeydown, onkeyup, enabledOnUserRole, visibleOnU= serRole, forceId, forceIdIndex, displayValueOnly, displayValueOnlyStyle, di= splayValueOnlyStyleClass</code>" + ENDTEXT=3D"</inputTextarea>" ICON=3D"" NAME=3D"inputTextarea" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputTextarea>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:outputLa= bel></code> <code></t:outputLabel></cod= e> Attributes: <code>id, rendered, binding, val= ue, converter, dir, lang, style, title, styleClass, onclick, ondblclick, on= mousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onk= eydown, onkeyup, accesskey, onblur, onfocus, for, enabledOnUserRole, visibl= eOnUserRole, forceId, forceIdIndex</code>" + ENDTEXT=3D"</outputLabel>" ICON=3D"" NAME=3D"outputLabel" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputLabel>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:messages= ></code> <code></t:messages></code><= br>Attributes: <code>id, rendered, binding, showSumma= ry, showDetail, globalOnly, dir, lang, style, title, styleClass, onclick, o= ndblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, on= keypress, onkeydown, onkeyup, infoClass, infoStyle, warnClass, warnStyle, e= rrorClass, errorStyle, fatalClass, fatalStyle, layout, tooltip, enabledOnUs= erRole, visibleOnUserRole, forceId, forceIdIndex, summaryFormat, globalSumm= aryFormat, detailFormat, replaceIdWithLabel</code>" + ENDTEXT=3D"</messages>" ICON=3D"" NAME=3D"messages" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<messages>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectOn= eMenu></code> <code></t:selectOneMenu><= /code> Attributes: <code>id, rendered, binding,= value, converter, immediate, required, validator, valueChangeListener, dir= , lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmouse= up, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, d= atafld, datasrc, dataformatas, disabled, onblur, onchange, onfocus, tabinde= x, readonly, enabledClass, disabledClass, enabledOnUserRole, visibleOnUserR= ole, forceId, forceIdIndex, displayValueOnly, displayValueOnlyStyle, displa= yValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectOneMenu>" ICON=3D"" NAME=3D"selectOneMenu" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:column&a= mp;gt;</code> <code></t:column></code> &= lt;b>Attributes: <code>id, rendered, binding, dir, lang, st= yle, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmous= eover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, headerdir, = headerlang, headerstyle, headertitle, headerstyleClass, headeronclick, head= erondblclick, headeronmousedown, headeronmouseup, headeronmouseover, header= onmousemove, headeronmouseout, headeronkeypress, headeronkeydown, headeronk= eyup, footerdir, footerlang, footerstyle, footertitle, footerstyleClass, fo= oteronclick, footerondblclick, footeronmousedown, footeronmouseup, footeron= mouseover, footeronmousemove, footeronmouseout, footeronkeypress, footeronk= eydown, footeronkeyup, width</code>" + ENDTEXT=3D"</column>" ICON=3D"" NAME=3D"column" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<column>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><t:graphicI= mage></code> <code></t:graphicImage></c= ode> Attributes: <code>id, rendered, binding, u= rl, value, dir, lang, style, title, styleClass, onclick, ondblclick, onmous= edown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydo= wn, onkeyup, align, border, hspace, vspace, alt, height, ismap, longdesc, u= semap, width, enabledOnUserRole, visibleOnUserRole, forceId, forceIdIndex&l= t;/code>" + ENDTEXT=3D"</graphicImage>" ICON=3D"" NAME=3D"graphicImage" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<graphicImage>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:message&= amp;gt;</code> <code></t:message></code><br= >Attributes: <code>for, id, rendered, bi= nding, showSummary, showDetail, dir, lang, style, title, styleClass, onclic= k, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout= , onkeypress, onkeydown, onkeyup, infoClass, infoStyle, warnClass, warnStyl= e, errorClass, errorStyle, fatalClass, fatalStyle, tooltip, enabledOnUserRo= le, visibleOnUserRole, forceId, forceIdIndex, summaryFormat, detailFormat, = replaceIdWithLabel</code>" + ENDTEXT=3D"</message>" ICON=3D"" NAME=3D"message" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<message for=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputDat= e></code> <code></t:inputDate></code>&l= t;br>Attributes: <code>id, rendered, binding, value, = converter, immediate, required, validator, valueChangeListener, dir, lang, = style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmo= useover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, accesskey= , align, alt, disabled, maxlength, onblur, onchange, onfocus, onselect, rea= donly, size, tabindex, enabledOnUserRole, visibleOnUserRole, type, popupCal= endar, timeZone</code>" + ENDTEXT=3D"</inputDate>" ICON=3D"" NAME=3D"inputDate" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<inputDate>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelNav= igation2></code> <code></t:panelNavigation2&g= t;</code> Attributes: <code>id, rendered, bi= nding, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedow= n, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, = onkeyup, align, border, bgcolor, cellpadding, cellspacing, datafld, datasrc= , dataformatas, frame, rules, summary, width, itemClass, openItemClass, act= iveItemClass, separatorClass, itemStyle, openItemStyle, activeItemStyle, se= paratorStyle, layout</code>" + ENDTEXT=3D"</panelNavigation2>" ICON=3D"" NAME=3D"panelNavigation2" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelNavigation2>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:dataList= ></code> <code></t:dataList></code><= br>Attributes: <code>var, id, rendered, = binding, dir, lang, style, title, styleClass, onclick, ondblclick, onmoused= own, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown= , onkeyup, forceId, forceIdIndex, value, rows, first, enabledOnUserRole, vi= sibleOnUserRole, layout, rowIndexVar, rowCountVar</code>" + ENDTEXT=3D"</dataList>" ICON=3D"" NAME=3D"dataList" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<dataList var=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:htmlTag&= amp;gt;</code> <code></t:htmlTag></code><br= >Attributes: <code>value, id, rendered, = binding, forceId, forceIdIndex, enabledOnUserRole, visibleOnUserRole, style= , styleClass</code>" + ENDTEXT=3D"</htmlTag>" ICON=3D"" NAME=3D"htmlTag" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<htmlTag value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:styleshe= et></code> <code></t:stylesheet></code>= Attributes: <code>path, id, rende= red, binding, enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</stylesheet>" ICON=3D"" NAME=3D"stylesheet" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<stylesheet path=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectMa= nyMenu></code> <code></t:selectManyMenu>&l= t;/code> Attributes: <code>id, rendered, bindin= g, value, converter, immediate, required, validator, valueChangeListener, d= ir, lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmou= seup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup,= datafld, datasrc, dataformatas, disabled, onblur, onchange, onfocus, tabin= dex, readonly, enabledClass, disabledClass, enabledOnUserRole, visibleOnUse= rRole, forceId, forceIdIndex, displayValueOnly, displayValueOnlyStyle, disp= layValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectManyMenu>" ICON=3D"" NAME=3D"selectManyMenu" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectManyMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:commandN= avigation></code> <code></t:commandNavigation&= ;gt;</code> Attributes: <code>id, rendered, = binding, action, actionListener, immediate, value, dir, lang, style, title,= styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmo= usemove, onmouseout, onkeypress, onkeydown, onkeyup, accesskey, charset, co= ords, hreflang, rel, rev, shape, tabindex, type, onblur, onfocus, target, e= nabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</commandNavigation>" ICON=3D"" NAME=3D"commandNavigati= on" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandNavigation= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:div&= gt;</code> <code></t:div></code> A= ttributes: <code>id, rendered, binding, forceId, forceIdInd= ex, enabledOnUserRole, visibleOnUserRole, style, styleClass</code>" + ENDTEXT=3D"</div>" ICON=3D"" NAME=3D"div" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<div>" large-icon=3D"" model-entity=3D"SharableMacroH= TML" /> + Syntax: <code><t:selectOn= eCountry></code> <code></t:selectOneCountry&g= t;</code> Attributes: <code>maxLength, id, r= endered, binding, value, converter, immediate, required, validator, valueCh= angeListener, dir, lang, style, title, styleClass, onclick, ondblclick, onm= ousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onke= ydown, onkeyup, datafld, datasrc, dataformatas, disabled, onblur, onchange,= onfocus, tabindex, readonly, enabledClass, disabledClass, enabledOnUserRol= e, visibleOnUserRole, forceId, forceIdIndex, displayValueOnly, displayValue= OnlyStyle, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectOneCountry>" ICON=3D"" NAME=3D"selectOneCountry" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneCountry>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelGro= up></code> <code></t:panelGroup></code>= Attributes: <code>id, rendered, binding, dir, = lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup= , onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, ena= bledOnUserRole, visibleOnUserRole, forceId, forceIdIndex, displayValueOnly,= displayValueOnlyStyle, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</panelGroup>" ICON=3D"" NAME=3D"panelGroup" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelGroup>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:updateAc= tionListener></code> <code></t:updateActionListen= er></code> Attributes: <code>pr= operty, value, converter</code>" + ENDTEXT=3D"</updateActionListener>" ICON=3D"" NAME=3D"updateAction= Listener" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<updateActionListener property=3D"|" value= =3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputTex= t></code> <code></t:inputText></code>&l= t;br>Attributes: <code>datafld, datasrc, dataformatas= , id, rendered, binding, value, converter, immediate, required, validator, = valueChangeListener, dir, lang, style, title, styleClass, onclick, ondblcli= ck, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypres= s, onkeydown, onkeyup, accesskey, align, alt, disabled, maxlength, onblur, = onchange, onfocus, onselect, readonly, size, tabindex, enabledOnUserRole, v= isibleOnUserRole, forceId, forceIdIndex, displayValueOnly, displayValueOnly= Style, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</inputText>" ICON=3D"" NAME=3D"inputText" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<inputText>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:dataTabl= e></code> <code></t:dataTable></code>&l= t;br>Attributes: <code>var, id, rendered= , binding, dir, lang, style, title, styleClass, onclick, ondblclick, onmous= edown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydo= wn, onkeyup, align, border, bgcolor, cellpadding, cellspacing, datafld, dat= asrc, dataformatas, frame, rules, summary, width, value, rows, first, colum= nClasses, footerClass, headerClass, rowClasses, forceId, forceIdIndex, enab= ledOnUserRole, visibleOnUserRole, preserveDataModel, forceIdIndexFormula, s= ortColumn, sortAscending, preserveSort, renderedIfEmpty, rowIndexVar, rowCo= untVar, previousRowDataVar, rowOnClick, rowOnDblClick, rowOnMouseDown, rowO= nMouseUp, rowOnMouseOver, rowOnMouseMove, rowOnMouseOut, rowOnKeyPress, row= OnKeyDown, rowOnKeyUp, rowId, rowStyleClass, rowStyle</code>" + ENDTEXT=3D"</dataTable>" ICON=3D"" NAME=3D"dataTable" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<dataTable var=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:collapsi= blePanel></code> <code></t:collapsiblePanel&g= t;</code> Attributes: <code>id, rendered, bi= nding, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedow= n, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, = onkeyup, enabledOnUserRole, visibleOnUserRole, collapsed, value</code>" + ENDTEXT=3D"</collapsiblePanel>" ICON=3D"" NAME=3D"collapsiblePanel" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<collapsiblePanel>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectBo= oleanCheckbox></code> <code></t:selectBooleanChec= kbox></code> Attributes: <code>id, re= ndered, binding, value, converter, immediate, required, validator, valueCha= ngeListener, dir, lang, style, title, styleClass, onclick, ondblclick, onmo= usedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkey= down, onkeyup, accesskey, alt, datafld, datasrc, dataformatas, disabled, on= blur, onchange, onfocus, onselect, readonly, tabindex, enabledOnUserRole, v= isibleOnUserRole, forceId, forceIdIndex, displayValueOnly, displayValueOnly= Style, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectBooleanCheckbox>" ICON=3D"" NAME=3D"selectBoole= anCheckbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectBooleanChec= kbox>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelNav= igation></code> <code></t:panelNavigation>= </code> Attributes: <code>id, rendered, bind= ing, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown,= onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, on= keyup, align, border, bgcolor, cellpadding, cellspacing, datafld, datasrc, = dataformatas, frame, rules, summary, width, itemClass, openItemClass, activ= eItemClass, separatorClass, itemStyle, openItemStyle, activeItemStyle, sepa= ratorStyle</code>" + ENDTEXT=3D"</panelNavigation>" ICON=3D"" NAME=3D"panelNavigation" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelNavigation>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:outputTe= xt></code> <code></t:outputText></code>= Attributes: <code>id, rendered, binding, value= , converter, dir, lang, style, title, styleClass, onclick, ondblclick, onmo= usedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkey= down, onkeyup, escape, enabledOnUserRole, visibleOnUserRole, forceId, force= IdIndex</code>" + ENDTEXT=3D"</outputText>" ICON=3D"" NAME=3D"outputText" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputText>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:aliasBea= nsScope></code> <code></t:aliasBeansScope>= </code> Attributes: <code>id</code>" + ENDTEXT=3D"</aliasBeansScope>" ICON=3D"" NAME=3D"aliasBeansScope" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<aliasBeansScope>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputHtm= l></code> <code></t:inputHtml></code>&l= t;br>Attributes: <code>id, rendered, binding, value, = converter, immediate, required, validator, valueChangeListener, enabledOnUs= erRole, visibleOnUserRole, displayValueOnly, displayValueOnlyStyle, display= ValueOnlyStyleClass, style, styleClass, fallback, type, allowEditSource, al= lowExternalLinks, addKupuLogo, showAllToolBoxes, showPropertiesToolBox, sho= wLinksToolBox, showImagesToolBox, showTablesToolBox, showCleanupExpressions= ToolBox, showDebugToolBox</code>" + ENDTEXT=3D"</inputHtml>" ICON=3D"" NAME=3D"inputHtml" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<inputHtml>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputTex= tHelp></code> <code></t:inputTextHelp><= /code> Attributes: <code>id, rendered, binding,= value, converter, immediate, required, validator, valueChangeListener, dir= , lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmouse= up, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, a= ccesskey, align, alt, disabled, maxlength, onblur, onchange, onfocus, onsel= ect, readonly, size, tabindex, enabledOnUserRole, visibleOnUserRole, forceI= d, forceIdIndex, displayValueOnly, displayValueOnlyStyle, displayValueOnlyS= tyleClass, helpText, selectText</code>" + ENDTEXT=3D"</inputTextHelp>" ICON=3D"" NAME=3D"inputTextHelp" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputTextHelp>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:selectMa= nyCheckbox></code> <code></t:selectManyCheckbox&a= mp;gt;</code> Attributes: <code>id, rendered= , binding, value, converter, immediate, required, validator, valueChangeLis= tener, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedow= n, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, = onkeyup, accesskey, alt, datafld, datasrc, dataformatas, disabled, onblur, = onchange, onfocus, onselect, readonly, tabindex, layout, enabledClass, disa= bledClass, enabledOnUserRole, visibleOnUserRole, forceId, forceIdIndex, dis= playValueOnly, displayValueOnlyStyle, displayValueOnlyStyleClass</code>" + ENDTEXT=3D"</selectManyCheckbox>" ICON=3D"" NAME=3D"selectManyChec= kbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectManyCheckbo= x>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:validate= Email></code> <code></t:validateEmail><= /code> Attributes: <code></code>" + ENDTEXT=3D"</validateEmail>" ICON=3D"" NAME=3D"validateEmail" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateEmail>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:jscookMe= nu></code> <code></t:jscookMenu></code>= Attributes: <code>layout, t= heme, id, rendered, binding, enabledOnUserRole, visibleOnUserRole<= ;/code>" + ENDTEXT=3D"</jscookMenu>" ICON=3D"" NAME=3D"jscookMenu" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<jscookMenu layout=3D"|" = theme=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:iconProv= ider /></code> Attributes: <code><= b>type</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"iconProvider" REFORMAT=3D"no" SCOPE=3D= "project" + STARTTEXT=3D"<iconProvider type=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:panelLay= out></code> <code></t:panelLayout></cod= e> Attributes: <code>id, rendered, binding, dir= , lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmouse= up, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, a= lign, border, bgcolor, cellpadding, cellspacing, datafld, datasrc, dataform= atas, frame, rules, summary, width, layout, headerClass, navigationClass, b= odyClass, footerClass, headerStyle, navigationStyle, bodyStyle, footerStyle= </code>" + ENDTEXT=3D"</panelLayout>" ICON=3D"" NAME=3D"panelLayout" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelLayout>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:navigati= onMenuItem></code> <code></t:navigationMenuItem&a= mp;gt;</code> Attributes: <code>binding, ite= mDisabled, id, itemDescription, itemLabel, itemValue, value, enabledOnUserR= ole, visibleOnUserRole, icon, split, action, rendered</code>" + ENDTEXT=3D"</navigationMenuItem>" ICON=3D"" NAME=3D"navigationMenu= Item" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<navigationMenuIte= m>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:commandL= ink></code> <code></t:commandLink></cod= e> Attributes: <code>id, rendered, binding, act= ion, actionListener, immediate, value, dir, lang, style, title, styleClass,= onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onm= ouseout, onkeypress, onkeydown, onkeyup, accesskey, charset, coords, hrefla= ng, rel, rev, shape, tabindex, type, onblur, onfocus, target, enabledOnUser= Role, visibleOnUserRole, forceId, forceIdIndex</code>" + ENDTEXT=3D"</commandLink>" ICON=3D"" NAME=3D"commandLink" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<commandLink>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:inputHid= den></code> <code></t:inputHidden></cod= e> Attributes: <code>id, rendered, binding, val= ue, converter, immediate, required, validator, valueChangeListener, forceId= , forceIdIndex</code>" + ENDTEXT=3D"</inputHidden>" ICON=3D"" NAME=3D"inputHidden" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<inputHidden value=3D"|"/= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:newspape= rTable></code> <code></t:newspaperTable>&l= t;/code> Attributes: <code>var, id= , rendered, binding, dir, lang, style, title, styleClass, onclick, ondblcli= ck, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypres= s, onkeydown, onkeyup, align, border, bgcolor, cellpadding, cellspacing, da= tafld, datasrc, dataformatas, frame, rules, summary, width, value, rows, fi= rst, columnClasses, footerClass, headerClass, rowClasses, newspaperColumns&= lt;/code>" + ENDTEXT=3D"</newspaperTable>" ICON=3D"" NAME=3D"newspaperTable" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<newspaperTable va= r=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><t:tabChang= eListener /></code> Attributes: <code= >type</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"tabChangeListener" REFORMAT=3D"no" SCO= PE=3D"project" + STARTTEXT=3D"<tabChangeListener type=3D"|"/>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + + + Name:&= lt;/font> <code> taglib</code> \nSyntax:= <code><%@ taglib uri=3D"http://myfaces.apache.org/san= dbox" prefix=3D"s" %></code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"MyFaces Sa= ndbox taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://myfaces.apache.org/sand= box" prefix=3D"s" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:fieldset= ></code> <code></s:fieldset></code><= br>Attributes: <code>id, rendered, binding, forceId, = forceIdIndex, enabledOnUserRole, visibleOnUserRole, style, styleClass, lege= nd</code>" + ENDTEXT=3D"</fieldset>" ICON=3D"" NAME=3D"fieldset" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<fieldset>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:graphicI= mageAjax></code> <code></s:graphicImageAjax&g= t;</code> Attributes: <code>getContent= TypeMethod, getBytesMethod, id, rendered, binding, dir,= lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmouseu= p, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, al= ign, border, hspace, vspace, alt, height, ismap, longdesc, usemap, width, e= nabledOnUserRole, visibleOnUserRole, forceId, forceIdIndex</code>" + ENDTEXT=3D"</graphicImageAjax>" ICON=3D"" NAME=3D"graphicImageAjax" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<graphicImageAjax getContentTypeMethod=3D"|"= ; getBytesMethod=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:convertB= oolean></code> <code></s:convertBoolean>&l= t;/code> Attributes: <code>trueValue, falseValu= e</code>" + ENDTEXT=3D"</convertBoolean>" ICON=3D"" NAME=3D"convertBoolean" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<convertBoolean>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:inputSug= gestAjax></code> <code></s:inputSuggestAjax&g= t;</code> Attributes: <code>suggestedI= temsMethod, id, rendered, binding, value, converter, immediate, requ= ired, validator, valueChangeListener, dir, lang, style, title, styleClass, = onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmo= useout, onkeypress, onkeydown, onkeyup, accesskey, align, alt, disabled, ma= xlength, onblur, onchange, onfocus, onselect, readonly, size, tabindex, for= ceId, forceIdIndex, javascriptLocation, imageLocation, styleLocation, displ= ayValueOnly, displayValueOnlyStyle, displayValueOnlyStyleClass, enabledOnUs= erRole, visibleOnUserRole, maxSuggestedItems, layout, popupStyle, popupStyl= eClass, popupId, listId, listStyle, listStyleClass, listItemStyle, listItem= StyleClass</code>" + ENDTEXT=3D"</inputSuggestAjax>" ICON=3D"" NAME=3D"inputSuggestAjax" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<inputSuggestAjax suggestedItemsMethod=3D"|"= ;>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:form&= ;gt;</code> <code></s:form></code> <b= >Attributes: <code>id, rendered, binding, dir, lang, style,= title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseove= r, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, accept, acceptC= harset, enctype, name, onreset, onsubmit, target, scheme, serverName, port&= lt;/code>" + ENDTEXT=3D"</form>" ICON=3D"" NAME=3D"form" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<form>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><s:planner = /></code> Attributes: <code>val= ue, id, rendered, binding, visibleEndHour, visibleStartHour, working= EndHour, workingStartHour, gutterWidthInPixels, headerDateFormat, legend, t= heme, tooltip</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"planner" REFORMAT=3D"no" SCOPE=3D"proj= ect" + STARTTEXT=3D"<planner value=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:validate= Url></code> <code></s:validateUrl></cod= e> Attributes: <code></code>" + ENDTEXT=3D"</validateUrl>" ICON=3D"" NAME=3D"validateUrl" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<validateUrl>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:autoUpda= teDataTable></code> <code></s:autoUpdateDataTable= ></code> Attributes: <code>var&= lt;/b>, id, rendered, binding, dir, lang, style, title, styleClass, onclick= , ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout,= onkeypress, onkeydown, onkeyup, align, border, bgcolor, cellpadding, cells= pacing, datafld, datasrc, dataformatas, frame, rules, summary, width, value= , rows, first, columnClasses, footerClass, headerClass, rowClasses, forceId= , forceIdIndex, enabledOnUserRole, visibleOnUserRole, preserveDataModel, so= rtColumn, sortAscending, preserveSort, renderedIfEmpty, rowIndexVar, rowCou= ntVar, previousRowDataVar, rowOnMouseOver, rowOnMouseOut, frequency</cod= e>" + ENDTEXT=3D"</autoUpdateDataTable>" ICON=3D"" NAME=3D"autoUpdateDat= aTable" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<autoUpdateDataTab= le var=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:schedule= /></code> Attributes: <code>id, rend= ered, binding, action, actionListener, immediate, value, visibleEndHour, vi= sibleStartHour, workingEndHour, workingStartHour, compactMonthRowHeight, co= mpactWeekRowHeight, headerDateFormat, readonly, theme, tooltip</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"schedule" REFORMAT=3D"no" SCOPE=3D"pro= ject" + STARTTEXT=3D"<schedule/>" large-icon=3D"" model-entity=3D"Sharable= MacroHTML" /> + Syntax: <code><s:inputSug= gest></code> <code></s:inputSuggest></c= ode> Attributes: <code>id, rendered, binding, v= alue, converter, immediate, required, validator, valueChangeListener, dir, = lang, style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup= , onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, acc= esskey, align, alt, disabled, maxlength, onblur, onchange, onfocus, onselec= t, readonly, size, tabindex, forceId, forceIdIndex, javascriptLocation, ima= geLocation, styleLocation</code>" + ENDTEXT=3D"</inputSuggest>" ICON=3D"" NAME=3D"inputSuggest" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<inputSuggest>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + + + Name:</b= > <code> Select One Menu</code> \nSyn= tax: <code><x:selectOneMenu></code> = <code></x:selectOneMenu></code> Attributes:= <code>id, rendered, binding, transient, value, converter, = immediate, required, validator, valueChangeListener, dir, lang, style, titl= e, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, on= mousemove, onmouseout, onkeypress, onkeydown, onkeyup, datafld, datasrc, da= taformatas, disabled, onblur, onchange, onfocus, tabindex, readonly, enable= dOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</selectOneMenu>" ICON=3D"" NAME=3D"selectOneMenu" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> rssTicker</code> Syntax:</= b> <code><x:rssTicker></code> <code>&= ;lt;/x:rssTicker></code> Attributes: <= ;code>rssUrl, dir, lang, style, title, styleClass</code>" + ENDTEXT=3D"</rssTicker>" ICON=3D"" NAME=3D"rssTicker" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<rssTicker rssUrl=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Panel Stack</code> \nSyntax:= <code><x:panelStack></code> <cod= e></x:panelStack></code> Attributes:<= ;br><code>selectedPanel, id</code>" + ENDTEXT=3D"</panelStack>" ICON=3D"" NAME=3D"panelStack" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelStack selectedPanel=3D"|= ">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Tree</code> \nSyntax:= <code><x:tree></code> <code></x:= tree></code> Attributes: <code>= value, id, styleClass, nodeClass, selectedNodeClass, iconClass, icon= Line, iconNoline, iconChild, iconChildFirst, iconChildMiddle, iconChildLast= , iconNodeOpen, iconNodeOpenFirst, iconNodeOpenMiddle, iconNodeOpenLast, ic= onNodeClose, iconNodeCloseFirst, iconNodeCloseMiddle, iconNodeCloseLast, ex= pandRoot, expireListeners</code>" + ENDTEXT=3D"</tree>" ICON=3D"" NAME=3D"tree" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<tree value=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Message</code> \nSyntax:<= /b> <code><x:message></code> <code>&= lt;/x:message></code> Attributes: <co= de>for, id, rendered, binding, transient, showSummary, showDet= ail, dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown,= onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, on= keyup, infoClass, infoStyle, warnClass, warnStyle, errorClass, errorStyle, = fatalClass, fatalStyle, tooltip, enabledOnUserRole, visibleOnUserRole, summ= aryFormat, detailFormat</code>" + ENDTEXT=3D"</message>" ICON=3D"" NAME=3D"message" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<message for=3D"|" >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Input Date</code> \nSyntax:&= lt;/b> <code><x:inputDate></code> <code>= </x:inputDate></code> Attributes:<br= ><code>id, rendered, binding, transient, value, converter, immediate, re= quired, validator, valueChangeListener, dir, lang, style, title, styleClass= , onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, on= mouseout, onkeypress, onkeydown, onkeyup, accesskey, align, alt, datafld, d= atasrc, dataformatas, disabled, maxlength, onblur, onchange, onfocus, onsel= ect, readonly, size, tabindex, type</code>" + ENDTEXT=3D"</inputDate>" ICON=3D"" NAME=3D"inputDate" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<inputDate>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Data Scroller</code> \nSynta= x: <code><x:dataScroller></code> <= ;code></x:dataScroller></code> Attributes:<= /b> <code>id, rendered, binding, transient, enabledOnUserRole, vis= ibleOnUserRole, for, fastStep, pageIndexVar, pageCountVar, styleClass, styl= e, paginator, paginatorMaxPages, paginatorTableClass, paginatorTableStyle, = paginatorColumnClass, paginatorColumnStyle, paginatorActiveColumnClass, pag= inatorActiveColumnStyle</code>" + ENDTEXT=3D"</dataScroller>" ICON=3D"" NAME=3D"dataScroller" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<dataScroller>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Validate Equial</code> \nSyn= tax: <code><x:validateEqual></code> = <code></x:validateEqual></code> Attributes:= <code>for</code>" + ENDTEXT=3D"</validateEqual>" ICON=3D"" NAME=3D"validateEqual" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateEqual for= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Data List</code> \nSyntax:&l= t;/b> <code><x:dataList></code> <code>&a= mp;lt;/x:dataList></code> Attributes: &l= t;code>var, id, rendered, binding, transient, dir, lang, style= , title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseov= er, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, value, rows, f= irst, enabledOnUserRole, visibleOnUserRole, layout, rowIndexVar, rowCountVa= r</code>" + ENDTEXT=3D"</dataList>" ICON=3D"" NAME=3D"dataList" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<dataList var=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Stylesheet</code> \nSyntax:&= lt;/b> <code><x:stylesheet></code> <code= ></x:stylesheet></code> Attributes:<= br><code>path, id, rendered, binding, transient, enabledOnU= serRole, visibleOnUserRole</code>" + ENDTEXT=3D"</stylesheet>" ICON=3D"" NAME=3D"stylesheet" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<stylesheet path=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Command Navigation</code> \n= Syntax: <code><x:commandNavigation></code>= <code></x:commandNavigation></code> = Attributes: <code>id, rendered, binding, transient, action,= actionListener, immediate, value, dir, lang, style, title, styleClass, onc= lick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouse= out, onkeypress, onkeydown, onkeyup, accesskey, charset, coords, hreflang, = re, rev, shape, tabindex, type, onblur, onfocus, target, enabledOnUserRole,= visibleOnUserRole</code>" + ENDTEXT=3D"</commandNavigation>" ICON=3D"" NAME=3D"commandNavigati= on" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandNavigation= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Select One Radio</code> Synta= x: <code><x:selectOneRadio></code> &= lt;code></x:selectOneRadio></code> Attributes:= <code>id, rendered, binding, transient, value, converter, = immediate, required, validator, valueChangeListener, dir, lang, style, titl= e, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, on= mousemove, onmouseout, onkeypress, onkeydown, onkeyup, accesskey, alt, data= fld, datasrc, dataformatas, disabled, onblur, onchange, onfocus, onselect, = readonly, tabindex, layout, border, enabledOnUserRole, visibleOnUserRole<= ;/code>" + ENDTEXT=3D"</selectOneRadio>" ICON=3D"" NAME=3D"selectOneRadio" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneRadio>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Panel Group</code> \nSyntax:= <code><x:panelGroup></code> <cod= e></x:panelGroup></code> Attributes:<= ;br><code>id, rendered, binding, transient, dir, lang, style, title, sty= leClass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousem= ove, onmouseout, onkeypress, onkeydown, onkeyup, enabledOnUserRole, visible= OnUserRole</code>" + ENDTEXT=3D"</panelGroup>" ICON=3D"" NAME=3D"panelGroup" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelGroup>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Update Action Listener</code> \n&l= t;b>Syntax: <code><x:updateActionListener><= ;/code> <code></x:updateActionListener></code><= ;br>Attributes: <code>property, va= lue, converter</code>" + ENDTEXT=3D"</updateActionListener>" ICON=3D"" NAME=3D"updateAction= Listener" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<updateActionListener property=3D"|" value= =3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Command Button</code> \nSynt= ax: <code><x:commandButton></code> &= lt;code></x:commandButton></code> Attributes:&= lt;/b> <code>id, rendered, binding, transient, action, actionListe= ner, immediate, value, dir, lang, style, title, styleClass, onclick, ondblc= lick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypr= ess, onkeydown, onkeyup, accesskey, alt, disabled, onblur, onchange, onfocu= s, onselect, size, tabindex, type, image, enabledOnUserRole, visibleOnUserR= ole</code>" + ENDTEXT=3D"</commandButton>" ICON=3D"" NAME=3D"commandButton" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandButton>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Input Text</code> \nSyntax:&= lt;/b> <code><x:inputText></code> <code>= </x:inputText></code> Attributes:<br= ><code>id, rendered, binding, transient, value, converter, immediate, re= quired, validator, valueChangeListener, dir, lang, style, title, styleClass= , onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, on= mouseout, onkeypress, onkeydown, onkeyup, accesskey, align, alt, datafld, d= atasrc, dataformatas, disabled, maxlength, onblur, onchange, onfocus, onsel= ect, readonly, size, tabindex, escape, enabledOnUserRole, visibleOnUserRole= </code>" + ENDTEXT=3D"</inputText>" ICON=3D"" NAME=3D"inputText" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<inputText>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> PanelTabbedPane</code> Syntax= : <code><x:panelTabbedPane></code> &= lt;code></x:panelTabbedPane></code> Attributes= : <code>id, rendered, binding, transient, dir, lang, style,= title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseove= r, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, align, border, = bgcolor, cellpadding, cellspacing, datafld, datasrc, dataformatas, frame, r= ules, summary, width, enabledOnUserRole, visibleOnUserRole, selectedIndex, = activeTabStyleClass, inactiveTabStyleClass, activeSubStyleClass, inactiveSu= bStyleClass, tabContentStyleClass</code>" + ENDTEXT=3D"</panelTabbedPane>" ICON=3D"" NAME=3D"panelTabbedPane" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelTabbedPane>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> taglib</code> \nSyntax:= <code><%@ taglib uri=3D"http://myfaces.sourceforge.ne= t/tld/myfaces_ext_0_9.tld" prefix=3D"x" %></code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"MyFaces Ex= t taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://myfaces.apache.org/exte= nsions" prefix=3D"x" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Data Table</code> \nSyntax:&= lt;/b> <code><x:dataTable></code> <code>= </x:dataTable></code> Attributes:<br= ><code>var, id, rendered, binding, transient, dir, lang, st= yle, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmous= eover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, align, bord= er, bgcolor, cellpadding, cellspacing, datafld, datasrc, dataformatas, fram= e, rules, summary, width, value, rows, first, columnClasses, footerClass, h= eaderClass, rowClasses, enabledOnUserRole, visibleOnUserRole, preserveDataM= odel, sortColumn, sortAscending, preserveSort, renderedIfEmpty, rowIndexVar= , rowCountVar, previousRowDataVar</code>" + ENDTEXT=3D"</dataTable>" ICON=3D"" NAME=3D"dataTable" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<dataTable var=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Tree Selection Listener</code> \n&= lt;b>Syntax: <code><x:treeSelectionListener/>= </code> Attributes: <code>type&= lt;/code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"treeSelectionListener" REFORMAT=3D"no" + SCOPE=3D"project" STARTTEXT=3D"<treeSelectionListener type=3D"= ;|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Panel Tab</code> \nSyntax:&l= t;/b> <code><x:panelTab></code> <code>&a= mp;lt;/x:panelTab></code> Attributes: &l= t;code>id, rendered, binding, transient, dir, lang, style, title, styleClas= s, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, o= nmouseout, onkeypress, onkeydown, onkeyup, enabledOnUserRole, visibleOnUser= Role, label</code>" + ENDTEXT=3D"</panelTab>" ICON=3D"" NAME=3D"panelTab" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<panelTab>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Output Text</code> \nSyntax:= <code><x:outputText></code> <cod= e></x:outputText></code> Attributes:<= ;br><code>id, rendered, binding, transient, value, converter, dir, lang,= style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onm= ouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, escape, = enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</outputText>" ICON=3D"" NAME=3D"outputText" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputText>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Panel Navigation</code> \nSy= ntax: <code><x:panelNavigation></code><= br><code></x:panelNavigation></code> Attrib= utes: <code>id, rendered, binding, transient, dir, lang, st= yle, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmous= eover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, align, bord= er, bgcolor, cellpadding, cellspacing, datafld, datasrc, dataformatas, fram= e, rules, summary, width, itemClass, openItemClass, activeItemClass, separa= torClass, itemStyle, openItemStyle, activeItemStyle, separatorStyle</cod= e>" + ENDTEXT=3D"</panelNavigation>" ICON=3D"" NAME=3D"panelNavigation" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelNavigation>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Command Sort Header</code> \n<b= >Syntax: <code><x:commandSortHeader></code= > <code></x:commandSortHeader></code> <b= >Attributes: <code>columnName, id, rendered, b= inding, transient, action, actionListener, immediate, value, dir, lang, sty= le, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouse= over, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, accesskey, c= harset, coords, hreflang, re, rev, shape, tabindex, type, onblur, onfocus, = target, enabledOnUserRole, visibleOnUserRole, arrow</code>" + ENDTEXT=3D"</commandSortHeader>" ICON=3D"" NAME=3D"commandSortHead= er" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<commandSortHeader columnName=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Validate Email</code> \nSynt= ax: <code><x:validateEmail></code> &= lt;code></x:validateEmail></code>" + ENDTEXT=3D"</validateEmail>" ICON=3D"" NAME=3D"validateEmail" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateEmail>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Select Many Checkbox</code> \n<= b>Syntax: <code><x:selectManyCheckbox></co= de> <code></x:selectManyCheckbox></code> &l= t;b>Attributes: <code>id, rendered, binding, transient, val= ue, converter, immediate, required, validator, valueChangeListener, dir, la= ng, style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, = onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, acces= skey, alt, datafld, datasrc, dataformatas, disabled, onblur, onchange, onfo= cus, onselect, readonly, tabindex, layout, enabledOnUserRole, visibleOnUser= Role</code>" + ENDTEXT=3D"</selectManyCheckbox>" ICON=3D"" NAME=3D"selectManyChec= kbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectManyCheckbo= x>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Value Credit Card</code> \nS= yntax: <code><x:validateCreditCard></code>= <code></x:validateCreditCard></code> <b= >Attributes: <code>none, amex, visa, mastercard, discover&l= t;/code>" + ENDTEXT=3D"</validateCreditCard>" ICON=3D"" NAME=3D"validateCredit= Card" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateCreditCar= d>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Input File Upload</code> \nS= yntax: <code><x:inputFileUpload></code><= ;br><code></x:inputFileUpload></code> Attri= butes: <code>id, rendered, binding, transient, value, conve= rter, immediate, required, validator, valueChangeListener, dir, lang, style= , title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouseov= er, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, accesskey, ali= gn, alt, datafld, datasrc, dataformatas, disabled, maxlength, onblur, oncha= nge, onfocus, onselect, readonly, size, tabindex, accept, storage</code>" + ENDTEXT=3D"</inputFileUpload>" ICON=3D"" NAME=3D"inputFileUpload" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputFileUpload>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Icon Provider</code> \nSynta= x: <code><x:iconProvider/></code> &l= t;b>Attributes: <code>type</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"iconProvider" REFORMAT=3D"no" SCOPE=3D= "project" + STARTTEXT=3D"<iconProvider type=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> jscookMenu</code> \nSyntax:&= lt;/b> <code><x:jscookMenu></code> <code= ></x:jscookMenu></code> Attributes:<= br><code>layout, theme, id, rendered, binding,= transient, enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</jscookMenu>" ICON=3D"" NAME=3D"jscookMenu" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<jscookMenu layout=3D"|" = theme=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Panel Layout</code> Syntax:&l= t;/b> <code><x:panelLayout></code> <code= ></x:panelLayout></code> Attributes:<= ;br><code>id, rendered, binding, transient, dir, lang, style, title, sty= leClass, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousem= ove, onmouseout, onkeypress, onkeydown, onkeyup, align, border, bgcolor, ce= llpadding, cellspacing, datafld, datasrc, dataformatas, frame, rules, summa= ry, width, layout, headerClass, navigationClass, bodyClass, footerClass, he= aderStyle, navigationStyle, bodyStyle, footerStyle</code>" + ENDTEXT=3D"</panelLayout>" ICON=3D"" NAME=3D"panelLayout" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelLayout>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Navigation Menu Item</code> \n<= b>Syntax: <code><x:navigationMenuItem></co= de> <code></x:navigationMenuItem></code> &l= t;b>Attributes: <code>binding, itemDisabled, id, itemDescri= ption, itemLabel, itemValue, value, enabledOnUserRole, visibleOnUserRole, i= con, split, action</code>" + ENDTEXT=3D"</navigationMenuItem>" ICON=3D"" NAME=3D"navigationMenu= Item" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<navigationMenuIte= m>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Checkbox</code> \nSyntax:<= ;/b> <code><x:checkbox></code> <code>&am= p;lt;/x:checkbox></code> Attributes: <= ;code>for, index, id, rendered, binding, transien= t, enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</checkbox>" ICON=3D"" NAME=3D"checkbox" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<checkbox for=3D"|" index= =3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Navigation Menu Items</code> = Syntax: <code><x:navigationMenuItems/></co= de> Attributes: <code>binding, id, value</co= de>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"navigationMenuItems" REFORMAT=3D"no" S= COPE=3D"project" + STARTTEXT=3D"<navigationMenuItems/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Input Calendar</code> \nSynt= ax: <code><x:inputCalendar></code> &= lt;code></x:inputCalendar></code> Attributes:&= lt;/b> <code>id, rendered, binding, transient, value, converter, i= mmediate, required, validator, valueChangeListener, onclick, ondblclick, on= mousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onk= eydown, onkeyup, dir, lang, style, title, styleClass, enabledOnUserRole, vi= sibleOnUserRole, monthYearRowClass, weekRowClass, dayCellClass, currentDayC= ellClass, renderAsPopup, popupDateFormat, popupButtonString, popupGotoStrin= g, popupTodayString, popupWeekString, popupScrollLeftMessage, popupScrollRi= ghtMessage, popupSelectMonthMessage, popupSelectYearMessage, popupSelectDat= eMessage</code>" + ENDTEXT=3D"</inputCalendar>" ICON=3D"" NAME=3D"inputCalendar" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputCalendar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Command Link</code> \nSyntax= : <code><x:commandLink></code> <c= ode></x:commandLink></code> Attributes:= <code>id, rendered, binding, transient, action, actionListener, i= mmediate, value, dir, lang, style, title, styleClass, onclick, ondblclick, = onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, o= nkeydown, onkeyup, accesskey, charset, coords, hreflang, rel, rev, shape, t= abindex, type, onblur, onfocus, target, enabledOnUserRole, visibleOnUserRol= e</code>" + ENDTEXT=3D"</commandLink>" ICON=3D"" NAME=3D"commandLink" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<commandLink>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Radio</code> \nSyntax:</b= > <code><x:radio></code> <code></= x:radio></code> Attributes: <code><= ;b>for, index, id, rendered, binding, transient, enable= dOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</radio>" ICON=3D"" NAME=3D"radio" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<radio for=3D"|" index=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> SaveState</code> Syntax:</= b> <code><x:saveState></code> <code>&= ;lt;/x:saveState></code> Attributes: <= ;code>value, id</code>" + ENDTEXT=3D"</saveState>" ICON=3D"" NAME=3D"saveState" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<saveState value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:&= lt;/font> <code> Validate RegExp</code> Syntax= : <code><x:validateRegExpr></code> &= lt;code></x:validateRegExpr></code> Attributes= : <code>pattern</code>" + ENDTEXT=3D"</validateRegExpr>" ICON=3D"" NAME=3D"validateRegExpr" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateRegExpr p= attern=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Input Text Area</code> \nSyn= tax: <code><x:inputTextarea></code> = <code></x:inputTextarea></code> Attributes:= <code>id, rendered, binding, transient, value, converter, = immediate, required, validator, valueChangeListener, accesskey, cols, dataf= ld, datasrc, dataformatas, disabled, onblur, onchange, onfocus, onselect, r= eadonly, rows, tabindex, dir, lang, style, title, styleClass, onclick, ondb= lclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkey= press, onkeydown, onkeyup, enabledOnUserRole, visibleOnUserRole</code>" + ENDTEXT=3D"</inputTextarea>" ICON=3D"" NAME=3D"inputTextarea" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inputTextarea val= ue=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Output Label</code> \nSyntax= : <code><x:outputLabel></code> <c= ode></x:outputLabel></code> Attributes:= <code>for, id, rendered, binding, transient, value, = converter, dir, lang, style, title, styleClass, onclick, ondblclick, onmous= edown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydo= wn, onkeyup, accesskey, onblur, onfocus, enabledOnUserRole, visibleOnUserRo= le</code>" + ENDTEXT=3D"</outputLabel>" ICON=3D"" NAME=3D"outputLabel" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputLabel for=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Tab Change Listener</code> \n<b= >Syntax: <code><x:tabChangeListener/></cod= e> Attributes: <code>type</code= >" + ENDTEXT=3D"" ICON=3D"" NAME=3D"tabChangeListener" REFORMAT=3D"no" SCO= PE=3D"project" + STARTTEXT=3D"<tabChangeListener type=3D"|"/>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + Name:</b= > <code> Messages</code> \nSyntax:<= ;/b> <code><x:messages></code> <code>&am= p;lt;/x:messages></code> Attributes: <= ;code>id, rendered, binding, transient, showSummary, showDetail, globalOnly= , dir, lang, style, title, styleClass, onclick, ondblclick, onmousedown, on= mouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkey= up, infoClass, infoStyle, warnClass, warnStyle, errorClass, errorStyle, fat= alClass, fatalStyle, layout, tooltip, enabledOnUserRole, visibleOnUserRole,= summaryFormat, globalSummaryFormat, detailFormat</code>" + ENDTEXT=3D"</messages>" ICON=3D"" NAME=3D"messages" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<messages>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + + + + + Syntax: <code><af:panelLi= st></code> <code></af:panelList></code>= Attributes: <code>id, rows, maxColumns, shortD= esc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseo= ver, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, i= nlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelList>" ICON=3D"" NAME=3D"panelList" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<panelList>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectM= anyListbox></code> <code></af:selectManyListbox&a= mp;gt;</code> Attributes: <code>id, size, va= luePassThru, readOnly, disabled, shortDesc, partialTriggers, label, tip, si= mple, onfocus, onblur, onchange, onclick, ondblclick, onmousedown, onmouseu= p, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, st= yleClass, inlineStyle, showRequired, valign, messageDescUrl, messageTargetF= rame, accessKey, labelAndAccessKey, autoSubmit, immediate, required, valida= tor, valueChangeListener, requiredMessageDetail, value, converter, rendered= , binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectManyListbox>" ICON=3D"" NAME=3D"selectManyListb= ox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectManyListbox= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:tree&am= p;gt;</code> <code></af:tree></code> <= ;b>Attributes: <code>id, shortDesc, partialTriggers, onclic= k, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout= , onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, var, varStatus, = value, treeState, focusRowKey, immediate, disclosureListener, rendered, bin= ding, attributeChangeListener</code>" + ENDTEXT=3D"</tree>" ICON=3D"" NAME=3D"tree" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<tree>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><af:region&= amp;gt;</code> <code></af:region></code><br= >Attributes: <code>regionType, id&= lt;/b>, value, rendered</code>" + ENDTEXT=3D"</region>" ICON=3D"" NAME=3D"region" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<region regionType=3D"|" id=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:validat= eDateTimeRange></code> <code></af:validateDateTim= eRange></code> Attributes: <code>id, = maximum, minimum, maximumMessageDetail, minimumMessageDetail, notInRangeMes= sageDetail</code>" + ENDTEXT=3D"</validateDateTimeRange>" ICON=3D"" NAME=3D"validateDat= eTimeRange" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateDateTimeR= ange>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:showDet= ailItem></code> <code></af:showDetailItem>= </code> Attributes: <code>id, disabled, text= , textAndAccessKey, accessKey, shortDesc, partialTriggers, onclick, ondblcl= ick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypre= ss, onkeydown, onkeyup, styleClass, inlineStyle, disclosed, immediate, disc= losureListener, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</showDetailItem>" ICON=3D"" NAME=3D"showDetailItem" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<showDetailItem>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:forEach= ></code> <code></af:forEach></code><= br>Attributes: <code>items, var, varStatus, begin, en= d, step</code>" + ENDTEXT=3D"</forEach>" ICON=3D"" NAME=3D"forEach" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<forEach>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectI= tem></code> <code></af:selectItem></cod= e> Attributes: <code>id, label, disabled, longD= esc, shortDesc, value, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectItem>" ICON=3D"" NAME=3D"selectItem" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<selectItem>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:objectI= con></code> <code></af:objectIcon></cod= e> Attributes: <code>id, name, shortDesc, parti= alTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmou= semove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle= , rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</objectIcon>" ICON=3D"" NAME=3D"objectIcon" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<objectIcon>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectI= nputColor></code> <code></af:selectInputColor&= ;gt;</code> Attributes: <code>id, compact, c= hooseId, readOnly, disabled, shortDesc, partialTriggers, label, tip, simple= , columns, onfocus, onblur, onchange, onclick, ondblclick, onmousedown, onm= ouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyu= p, styleClass, inlineStyle, showRequired, valign, messageDescUrl, messageTa= rgetFrame, accessKey, labelAndAccessKey, autoSubmit, action, actionListener= , returnListener, immediate, required, validator, valueChangeListener, requ= iredMessageDetail, value, converter, rendered, binding, attributeChangeList= ener</code>" + ENDTEXT=3D"</selectInputColor>" ICON=3D"" NAME=3D"selectInputColor" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectInputColor>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:menuTab= s></code> <code></af:menuTabs></code>&l= t;br>Attributes: <code>id, shortDesc, partialTriggers= , onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, on= mouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, value, s= tartDepth, var, varStatus, rendered, binding, attributeChangeListener</c= ode>" + ENDTEXT=3D"</menuTabs>" ICON=3D"" NAME=3D"menuTabs" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<menuTabs>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:singleS= tepButtonBar></code> <code></af:singleStepButtonB= ar></code> Attributes: <code>id, shor= tDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmous= eover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass,= inlineStyle, selectedStep, maxStep, text, previousActionListener, nextActi= onListener, nextAction, previousAction, rendered, binding, attributeChangeL= istener</code>" + ENDTEXT=3D"</singleStepButtonBar>" ICON=3D"" NAME=3D"singleStepBut= tonBar" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<singleStepButtonB= ar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:menuBar= ></code> <code></af:menuBar></code><= br>Attributes: <code>id, shortDesc, partialTriggers, = onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmo= useout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, value, sta= rtDepth, var, varStatus, rendered, binding, attributeChangeListener</cod= e>" + ENDTEXT=3D"</menuBar>" ICON=3D"" NAME=3D"menuBar" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<menuBar>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:resetAc= tionListener /></code> Attributes: <c= ode></code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"resetActionListener" REFORMAT=3D"no" S= COPE=3D"project" + STARTTEXT=3D"<resetActionListener/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:showDet= ail></code> <code></af:showDetail></cod= e> Attributes: <code>id, disclosedText, undiscl= osedText, shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onm= ouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyu= p, styleClass, inlineStyle, disclosed, immediate, disclosureListener, rende= red, binding, attributeChangeListener</code>" + ENDTEXT=3D"</showDetail>" ICON=3D"" NAME=3D"showDetail" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<showDetail>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:process= ChoiceBar></code> <code></af:processChoiceBar&= ;gt;</code> Attributes: <code>id, shortDesc,= partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover,= onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlin= eStyle, value, var, varStatus, rendered, binding, attributeChangeListener&l= t;/code>" + ENDTEXT=3D"</processChoiceBar>" ICON=3D"" NAME=3D"processChoiceBar" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<processChoiceBar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:objectS= eparator></code> <code></af:objectSeparator&g= t;</code> Attributes: <code>id, shortDesc, p= artialTriggers, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</objectSeparator>" ICON=3D"" NAME=3D"objectSeparator" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<objectSeparator>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:validat= or /></code> Attributes: <code>valida= torId, binding</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"validator" REFORMAT=3D"no" SCOPE=3D"pr= oject" + STARTTEXT=3D"<validator/>" large-icon=3D"" model-entity=3D"Sharabl= eMacroHTML" /> + Syntax: <code><af:treeTab= le></code> <code></af:treeTable></code>= Attributes: <code>id, expandAllEnabled, shortD= esc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseo= ver, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, i= nlineStyle, width, emptyText, summary, banding, bandingInterval, focusListe= ner, rowsByDepth, selectionListener, disclosureAllListener, rangeChangeList= ener, var, varStatus, value, treeState, focusRowKey, immediate, disclosureL= istener, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</treeTable>" ICON=3D"" NAME=3D"treeTable" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<treeTable>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:subform= ></code> <code></af:subform></code><= br>Attributes: <code>id, default, rendered, binding, = attributeChangeListener</code>" + ENDTEXT=3D"</subform>" ICON=3D"" NAME=3D"subform" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<subform>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelPa= ge></code> <code></af:panelPage></code>= Attributes: <code>id, title, messageType, chro= meType, quickLinksShown, shortDesc, partialTriggers, onclick, ondblclick, o= nmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, on= keydown, onkeyup, styleClass, inlineStyle, rendered, binding, attributeChan= geListener</code>" + ENDTEXT=3D"</panelPage>" ICON=3D"" NAME=3D"panelPage" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<panelPage>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:page&am= p;gt;</code> <code></af:page></code> <= ;b>Attributes: <code>id, title, messageType, chromeType, qu= ickLinksShown, shortDesc, partialTriggers, onclick, ondblclick, onmousedown= , onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, o= nkeyup, styleClass, inlineStyle, value, var, varStatus, immediate, disclosu= reListener, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</page>" ICON=3D"" NAME=3D"page" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<page>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><af:objectL= egend></code> <code></af:objectLegend><= /code> Attributes: <code>id, name, shortDesc, p= artialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, o= nmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineS= tyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</objectLegend>" ICON=3D"" NAME=3D"objectLegend" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<objectLegend>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:message= s></code> <code></af:messages></code>&l= t;br>Attributes: <code>id, message, text, globalOnly,= shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, o= nmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleC= lass, inlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</messages>" ICON=3D"" NAME=3D"messages" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<messages>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:convert= Number></code> <code></af:convertNumber>&l= t;/code> Attributes: <code>id, currencyCode, co= nvertCurrencyMessageDetail, convertNumberMessageDetail, convertPatternMessa= geDetail, convertPercentMessageDetail, currencySymbol, groupingUsed, intege= rOnly, locale, maxFractionDigits, maxIntegerDigits, minFractionDigits, minI= ntegerDigits, pattern, type</code>" + ENDTEXT=3D"</convertNumber>" ICON=3D"" NAME=3D"convertNumber" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<convertNumber>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:attribu= te /></code> Attributes: <code>name, = value</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"attribute" REFORMAT=3D"no" SCOPE=3D"pr= oject" + STARTTEXT=3D"<attribute/>" large-icon=3D"" model-entity=3D"Sharabl= eMacroHTML" /> + Syntax: <code><af:selectI= nputText></code> <code></af:selectInputText&g= t;</code> Attributes: <code>id, searchDesc, = icon, readOnly, disabled, shortDesc, partialTriggers, label, tip, simple, o= nfocus, onblur, onchange, onclick, ondblclick, onmousedown, onmouseup, onmo= useover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClas= s, inlineStyle, showRequired, valign, messageDescUrl, messageTargetFrame, a= ccessKey, labelAndAccessKey, onselect, columns, maximumLength, autoSubmit, = windowWidth, windowHeight, action, actionListener, returnListener, immediat= e, required, validator, valueChangeListener, requiredMessageDetail, value, = converter, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectInputText>" ICON=3D"" NAME=3D"selectInputText" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectInputText>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:message= ></code> <code></af:message></code><= br>Attributes: <code>id, tip, message, messageType, s= hortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onm= ouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleCla= ss, inlineStyle, for, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</message>" ICON=3D"" NAME=3D"message" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<message>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:showDet= ailHeader></code> <code></af:showDetailHeader&= ;gt;</code> Attributes: <code>id, text, shor= tText, icon, size, shortDesc, partialTriggers, onclick, ondblclick, onmouse= down, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydow= n, onkeyup, styleClass, inlineStyle, disclosed, immediate, disclosureListen= er, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</showDetailHeader>" ICON=3D"" NAME=3D"showDetailHeader" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<showDetailHeader>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:menuCho= ice></code> <code></af:menuChoice></cod= e> Attributes: <code>id, title, disabled, onfoc= us, onblur, onchange, shortDesc, partialTriggers, onclick, ondblclick, onmo= usedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkey= down, onkeyup, styleClass, inlineStyle, value, startDepth, var, varStatus, = rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</menuChoice>" ICON=3D"" NAME=3D"menuChoice" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<menuChoice>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:validat= eRegExp></code> <code></af:validateRegExp>= </code> Attributes: <code>id, pattern, noMat= chMessageDetail</code>" + ENDTEXT=3D"</validateRegExp>" ICON=3D"" NAME=3D"validateRegExp" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateRegExp>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:showOne= Radio></code> <code></af:showOneRadio><= /code> Attributes: <code>id, label, shortDesc, = partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, = onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inline= Style, position, alignment, rendered, binding, attributeChangeListener</= code>" + ENDTEXT=3D"</showOneRadio>" ICON=3D"" NAME=3D"showOneRadio" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<showOneRadio>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:menuLis= t></code> <code></af:menuList></code>&l= t;br>Attributes: <code>id, listStyle, shortDesc, part= ialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmo= usemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyl= e, value, startDepth, var, varStatus, rendered, binding, attributeChangeLis= tener</code>" + ENDTEXT=3D"</menuList>" ICON=3D"" NAME=3D"menuList" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<menuList>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:convert= Color></code> <code></af:convertColor><= /code> Attributes: <code>id, patterns, transpar= entAllowed, convertMessageDetail</code>" + ENDTEXT=3D"</convertColor>" ICON=3D"" NAME=3D"convertColor" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<convertColor>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelGr= oup></code> <code></af:panelGroup></cod= e> Attributes: <code>id, layout, shortDesc, par= tialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onm= ousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineSty= le, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelGroup>" ICON=3D"" NAME=3D"panelGroup" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelGroup>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:process= Train></code> <code></af:processTrain><= /code> Attributes: <code>id, shortDesc, partial= Triggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmouse= move, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, = value, var, varStatus, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</processTrain>" ICON=3D"" NAME=3D"processTrain" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<processTrain>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:inputTe= xt></code> <code></af:inputText></code>= Attributes: <code>id, rows, wrap, secret, read= Only, disabled, shortDesc, partialTriggers, label, tip, simple, onfocus, on= blur, onchange, onclick, ondblclick, onmousedown, onmouseup, onmouseover, o= nmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineS= tyle, showRequired, valign, messageDescUrl, messageTargetFrame, columns, ma= ximumLength, onselect, accessKey, labelAndAccessKey, autoSubmit, immediate,= required, validator, valueChangeListener, requiredMessageDetail, value, co= nverter, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</inputText>" ICON=3D"" NAME=3D"inputText" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<inputText>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:poll&am= p;gt;</code> <code></af:poll></code> <= ;b>Attributes: <code>id, interval, immediate, pollListener,= rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</poll>" ICON=3D"" NAME=3D"poll" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<poll>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><af:goButto= n></code> <code></af:goButton></code>&l= t;br>Attributes: <code>id, text, longDesc, disabled, = textAndAccessKey, accessKey, shortDesc, partialTriggers, onfocus, onblur, t= argetFrame, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmou= semove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle= , destination, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</goButton>" ICON=3D"" NAME=3D"goButton" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<goButton>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:showOne= Panel></code> <code></af:showOnePanel><= /code> Attributes: <code>id, shortDesc, partial= Triggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmouse= move, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, = rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</showOnePanel>" ICON=3D"" NAME=3D"showOnePanel" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<showOnePanel>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:menuBut= tons></code> <code></af:menuButtons></c= ode> Attributes: <code>id, shortDesc, partialTr= iggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemo= ve, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, va= lue, startDepth, var, varStatus, rendered, binding, attributeChangeListener= </code>" + ENDTEXT=3D"</menuButtons>" ICON=3D"" NAME=3D"menuButtons" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<menuButtons>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:outputT= ext></code> <code></af:outputText></cod= e> Attributes: <code>id, truncateAt, descriptio= n, escape, shortDesc, partialTriggers, onclick, ondblclick, onmousedown, on= mouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkey= up, styleClass, inlineStyle, value, converter, rendered, binding, attribute= ChangeListener</code>" + ENDTEXT=3D"</outputText>" ICON=3D"" NAME=3D"outputText" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputText>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectR= angeChoiceBar></code> <code></af:selectRangeChoic= eBar></code> Attributes: <code>id, sh= ortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmo= useover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClas= s, inlineStyle, var, immediate, rangeChangeListener, value, rows, first, re= ndered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectRangeChoiceBar>" ICON=3D"" NAME=3D"selectRangeC= hoiceBar" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectRangeChoice= Bar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:setActi= onListener /></code> Attributes: <cod= e>to, from</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"setActionListener" REFORMAT=3D"no" SCO= PE=3D"project" + STARTTEXT=3D"<setActionListener to=3D"|" from=3D"&q= uot;/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:resetBu= tton></code> <code></af:resetButton></c= ode> Attributes: <code>id, text, disabled, text= AndAccessKey, accessKey, shortDesc, partialTriggers, onclick, ondblclick, o= nmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, on= keydown, onkeyup, styleClass, inlineStyle, rendered, binding, attributeChan= geListener</code>" + ENDTEXT=3D"</resetButton>" ICON=3D"" NAME=3D"resetButton" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<resetButton>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:goMenuI= tem></code> <code></af:goMenuItem></cod= e> Attributes: <code>id, icon, selected, readOn= ly, type, text, longDesc, disabled, textAndAccessKey, accessKey, shortDesc,= partialTriggers, onfocus, onblur, targetFrame, onclick, ondblclick, onmous= edown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydo= wn, onkeyup, styleClass, inlineStyle, destination, rendered, binding, attri= buteChangeListener</code>" + ENDTEXT=3D"</goMenuItem>" ICON=3D"" NAME=3D"goMenuItem" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<goMenuItem>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:showOne= Tab></code> <code></af:showOneTab></cod= e> Attributes: <code>id, position, shortDesc, p= artialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, o= nmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineS= tyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</showOneTab>" ICON=3D"" NAME=3D"showOneTab" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<showOneTab>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelPa= rtialRoot></code> <code></af:panelPartialRoot&= ;gt;</code> Attributes: <code>id, shortDesc,= partialTriggers, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelPartialRoot>" ICON=3D"" NAME=3D"panelPartialRoot" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelPartialRoot>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:inputHi= dden></code> <code></af:inputHidden></c= ode> Attributes: <code>id, immediate, required,= validator, valueChangeListener, requiredMessageDetail, value, converter, r= endered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</inputHidden>" ICON=3D"" NAME=3D"inputHidden" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<inputHidden>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:objectM= edia></code> <code></af:objectMedia></c= ode> Attributes: <code>id, width, height, inner= Width, innerHeight, source, autostart, playCount, contentType, standbyText,= player, controls, shortDesc, partialTriggers, onclick, ondblclick, onmouse= down, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydow= n, onkeyup, styleClass, inlineStyle, rendered, binding, attributeChangeList= ener</code>" + ENDTEXT=3D"</objectMedia>" ICON=3D"" NAME=3D"objectMedia" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<objectMedia>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectO= neChoice></code> <code></af:selectOneChoice&g= t;</code> Attributes: <code>id, unselectedLa= bel, valuePassThru, readOnly, disabled, shortDesc, partialTriggers, label, = tip, simple, onfocus, onblur, onchange, onclick, ondblclick, onmousedown, o= nmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onke= yup, styleClass, inlineStyle, showRequired, valign, messageDescUrl, message= TargetFrame, accessKey, labelAndAccessKey, autoSubmit, immediate, required,= validator, valueChangeListener, requiredMessageDetail, value, converter, r= endered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectOneChoice>" ICON=3D"" NAME=3D"selectOneChoice" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneChoice>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:table&a= mp;gt;</code> <code></af:table></code> &= lt;b>Attributes: <code>id, allDetailsEnabled, shortDesc, pa= rtialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, on= mousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineSt= yle, width, emptyText, summary, banding, bandingInterval, selectionState, s= ortListener, selectionListener, disclosureAllListener, immediate, disclosur= eListener, rangeChangeListener, var, varStatus, value, rows, first, rendere= d, binding, attributeChangeListener</code>" + ENDTEXT=3D"</table>" ICON=3D"" NAME=3D"table" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<table>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><af:switche= r></code> <code></af:switcher></code>&l= t;br>Attributes: <code>id, facetName, defaultFacet, r= endered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</switcher>" ICON=3D"" NAME=3D"switcher" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<switcher>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelHe= ader></code> <code></af:panelHeader></c= ode> Attributes: <code>id, text, shortText, ico= n, messageType, size, shortDesc, partialTriggers, onclick, ondblclick, onmo= usedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkey= down, onkeyup, styleClass, inlineStyle, rendered, binding, attributeChangeL= istener</code>" + ENDTEXT=3D"</panelHeader>" ICON=3D"" NAME=3D"panelHeader" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelHeader>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelTi= p></code> <code></af:panelTip></code>&l= t;br>Attributes: <code>id, shortDesc, partialTriggers= , onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, on= mouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, rendered= , binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelTip>" ICON=3D"" NAME=3D"panelTip" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<panelTip>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectM= anyShuttle></code> <code></af:selectManyShuttle&a= mp;gt;</code> Attributes: <code>id, valuePas= sThru, readOnly, disabled, shortDesc, partialTriggers, onfocus, onblur, onc= hange, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemov= e, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, siz= e, leadingHeader, trailingHeader, leadingDescShown, trailingDescShown, labe= l, immediate, required, validator, valueChangeListener, requiredMessageDeta= il, value, converter, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectManyShuttle>" ICON=3D"" NAME=3D"selectManyShutt= le" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectManyShuttle= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelPa= geHeader></code> <code></af:panelPageHeader&g= t;</code> Attributes: <code>id, chromeType, = shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, on= mouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleCl= ass, inlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelPageHeader>" ICON=3D"" NAME=3D"panelPageHeader" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelPageHeader>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectO= neRadio></code> <code></af:selectOneRadio>= </code> Attributes: <code>id, unselectedLabe= l, layout, valuePassThru, readOnly, disabled, shortDesc, partialTriggers, l= abel, tip, simple, onfocus, onblur, onchange, onclick, ondblclick, onmoused= own, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown= , onkeyup, styleClass, inlineStyle, showRequired, valign, messageDescUrl, m= essageTargetFrame, accessKey, labelAndAccessKey, autoSubmit, immediate, req= uired, validator, valueChangeListener, requiredMessageDetail, value, conver= ter, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectOneRadio>" ICON=3D"" NAME=3D"selectOneRadio" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneRadio>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:tableSe= lectMany></code> <code></af:tableSelectMany&g= t;</code> Attributes: <code>id, shortDesc, p= artialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, o= nmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineS= tyle, text, disabled, autoSubmit, required, rendered, binding, attributeCha= ngeListener</code>" + ENDTEXT=3D"</tableSelectMany>" ICON=3D"" NAME=3D"tableSelectMany" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<tableSelectMany>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectO= neListbox></code> <code></af:selectOneListbox&= ;gt;</code> Attributes: <code>id, size, valu= ePassThru, readOnly, disabled, shortDesc, partialTriggers, label, tip, simp= le, onfocus, onblur, onchange, onclick, ondblclick, onmousedown, onmouseup,= onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styl= eClass, inlineStyle, showRequired, valign, messageDescUrl, messageTargetFra= me, accessKey, labelAndAccessKey, autoSubmit, immediate, required, validato= r, valueChangeListener, requiredMessageDetail, value, converter, rendered, = binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectOneListbox>" ICON=3D"" NAME=3D"selectOneListbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOneListbox>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectB= ooleanRadio></code> <code></af:selectBooleanRadio= ></code> Attributes: <code>id, autoSu= bmit, readOnly, disabled, shortDesc, partialTriggers, label, tip, simple, t= ext, accessKey, textAndAccessKey, group, onfocus, onblur, onchange, onclick= , ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout,= onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, showRequired, val= ign, messageDescUrl, messageTargetFrame, selected, immediate, required, val= idator, valueChangeListener, requiredMessageDetail, value, converter, rende= red, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectBooleanRadio>" ICON=3D"" NAME=3D"selectBooleanR= adio" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectBooleanRadi= o>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:command= Button></code> <code></af:commandButton>&l= t;/code> Attributes: <code>id, text, disabled, = textAndAccessKey, accessKey, partialSubmit, shortDesc, partialTriggers, use= Window, windowWidth, windowHeight, onclick, ondblclick, onmousedown, onmous= eup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, = styleClass, inlineStyle, blocking, action, actionListener, returnListener, = launchListener, immediate, rendered, binding, attributeChangeListener</c= ode>" + ENDTEXT=3D"</commandButton>" ICON=3D"" NAME=3D"commandButton" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandButton>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:goLink&= amp;gt;</code> <code></af:goLink></code><br= >Attributes: <code>id, text, longDesc, disabled, text= AndAccessKey, accessKey, shortDesc, partialTriggers, onfocus, onblur, targe= tFrame, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemo= ve, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, de= stination, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</goLink>" ICON=3D"" NAME=3D"goLink" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<goLink>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><af:importS= cript></code> <code></af:importScript><= /code> Attributes: <code>id, names, rendered, b= inding, attributeChangeListener</code>" + ENDTEXT=3D"</importScript>" ICON=3D"" NAME=3D"importScript" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<importScript>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:objectI= mage></code> <code></af:objectImage></c= ode> Attributes: <code>id, source, height, widt= h, align, longDescURL, borderWidth, imageMapType, shortDesc, partialTrigger= s, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, o= nmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, rendere= d, binding, attributeChangeListener</code>" + ENDTEXT=3D"</objectImage>" ICON=3D"" NAME=3D"objectImage" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<objectImage>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:returnA= ctionListener /></code> Attributes: <= code>value</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"returnActionListener" REFORMAT=3D"no" = SCOPE=3D"project" + STARTTEXT=3D"<returnActionListener/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:chooseC= olor></code> <code></af:chooseColor></c= ode> Attributes: <code>id, colorData, customCol= orData, width, shortDesc, partialTriggers, onclick, ondblclick, onmousedown= , onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, o= nkeyup, styleClass, inlineStyle, rendered, binding, attributeChangeListener= </code>" + ENDTEXT=3D"</chooseColor>" ICON=3D"" NAME=3D"chooseColor" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<chooseColor>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:chooseD= ate></code> <code></af:chooseDate></cod= e> Attributes: <code>id, minValue, maxValue, sh= ortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmo= useover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClas= s, inlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</chooseDate>" ICON=3D"" NAME=3D"chooseDate" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<chooseDate>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelBu= ttonBar></code> <code></af:panelButtonBar>= </code> Attributes: <code>id, shortDesc, par= tialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onm= ousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineSty= le, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelButtonBar>" ICON=3D"" NAME=3D"panelButtonBar" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelButtonBar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:tableSe= lectOne></code> <code></af:tableSelectOne>= </code> Attributes: <code>id, shortDesc, par= tialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onm= ousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineSty= le, text, disabled, autoSubmit, required, rendered, binding, attributeChang= eListener</code>" + ENDTEXT=3D"</tableSelectOne>" ICON=3D"" NAME=3D"tableSelectOne" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<tableSelectOne>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:outputL= abel></code> <code></af:outputLabel></c= ode> Attributes: <code>id, accessKey, showRequi= red, valueAndAccessKey, shortDesc, partialTriggers, onclick, ondblclick, on= mousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onk= eydown, onkeyup, styleClass, inlineStyle, messageType, for, messageDescUrl,= messageTargetFrame, anchor, value, converter, rendered, binding, attribute= ChangeListener</code>" + ENDTEXT=3D"</outputLabel>" ICON=3D"" NAME=3D"outputLabel" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputLabel>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:inputFi= le></code> <code></af:inputFile></code>= Attributes: <code>id, columns, onfocus, onblur= , onchange, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmou= semove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle= , showRequired, valign, messageDescUrl, messageTargetFrame, accessKey, labe= lAndAccessKey, disabled, shortDesc, partialTriggers, label, tip, simple, on= select, immediate, required, validator, valueChangeListener, requiredMessag= eDetail, value, converter, rendered, binding, attributeChangeListener</c= ode>" + ENDTEXT=3D"</inputFile>" ICON=3D"" NAME=3D"inputFile" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<inputFile>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><%@ taglib = uri=3D"http://xmlns.oracle.com/adf/faces" prefix=3D"af"= %></code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"ADF Faces = Core taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://xmlns.oracle.com/adf/fa= ces" prefix=3D"af" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:form&am= p;gt;</code> <code></af:form></code> <= ;b>Attributes: <code>id, targetFrame, usesUpload, defaultCo= mmand, onsubmit, shortDesc, partialTriggers, onclick, ondblclick, onmousedo= wn, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown,= onkeyup, styleClass, inlineStyle, rendered, binding, attributeChangeListen= er</code>" + ENDTEXT=3D"</form>" ICON=3D"" NAME=3D"form" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<form>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><af:column&= amp;gt;</code> <code></af:column></code><br= >Attributes: <code>id, formatType, gridVisible, width= , headerText, bandingShade, noWrap, headerNoWrap, sortable, separateRows, r= owHeader, shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onm= ouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyu= p, styleClass, inlineStyle, sortProperty, rendered, binding, attributeChang= eListener</code>" + ENDTEXT=3D"</column>" ICON=3D"" NAME=3D"column" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<column>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><af:progres= sIndicator></code> <code></af:progressIndicator&a= mp;gt;</code> Attributes: <code>id, shortDes= c, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseove= r, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inl= ineStyle, value, action, actionListener, immediate, rendered, binding, attr= ibuteChangeListener</code>" + ENDTEXT=3D"</progressIndicator>" ICON=3D"" NAME=3D"progressIndicat= or" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<progressIndicator= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelSi= deBar></code> <code></af:panelSideBar><= /code> Attributes: <code>id, width, shortDesc, = partialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, = onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inline= Style, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelSideBar>" ICON=3D"" NAME=3D"panelSideBar" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelSideBar>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:convert= DateTime></code> <code></af:convertDateTime&g= t;</code> Attributes: <code>id, convertDateM= essageDetail, convertTimeMessageDetail, convertBothMessageDetail, dateStyle= , locale, pattern, secondaryPattern, timeStyle, timeZone, type</code>" + ENDTEXT=3D"</convertDateTime>" ICON=3D"" NAME=3D"convertDateTime" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<convertDateTime>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:documen= t></code> <code></af:document></code>&l= t;br>Attributes: <code>id, title, shortDesc, partialT= riggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousem= ove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, o= nload, onunload, initialFocusId, rendered, binding, attributeChangeListener= </code>" + ENDTEXT=3D"</document>" ICON=3D"" NAME=3D"document" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<document>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelHo= rizontal></code> <code></af:panelHorizontal&g= t;</code> Attributes: <code>id, valign, hali= gn, shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup= , onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, sty= leClass, inlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelHorizontal>" ICON=3D"" NAME=3D"panelHorizontal" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelHorizontal>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:regionD= ef></code> <code></af:regionDef></code>= Attributes: <code>var</code>" + ENDTEXT=3D"</regionDef>" ICON=3D"" NAME=3D"regionDef" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<regionDef>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:menuPat= h></code> <code></af:menuPath></code>&l= t;br>Attributes: <code>id, orientation, shortDesc, pa= rtialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, on= mousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineSt= yle, value, var, varStatus, rendered, binding, attributeChangeListener</= code>" + ENDTEXT=3D"</menuPath>" ICON=3D"" NAME=3D"menuPath" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<menuPath>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelBo= rder></code> <code></af:panelBorder></c= ode> Attributes: <code>id, shortDesc, partialTr= iggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemo= ve, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, re= ndered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelBorder>" ICON=3D"" NAME=3D"panelBorder" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<panelBorder>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:validat= eByteLength></code> <code></af:validateByteLength= ></code> Attributes: <code>id, maximu= m, encoding, maximumMessageDetail</code>" + ENDTEXT=3D"</validateByteLength>" ICON=3D"" NAME=3D"validateByteLe= ngth" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateByteLengt= h>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:objectS= pacer></code> <code></af:objectSpacer><= /code> Attributes: <code>id, width, height, sho= rtDesc, partialTriggers, rendered, binding, attributeChangeListener</cod= e>" + ENDTEXT=3D"</objectSpacer>" ICON=3D"" NAME=3D"objectSpacer" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<objectSpacer>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectB= ooleanCheckbox></code> <code></af:selectBooleanCh= eckbox></code> Attributes: <code>id, = autoSubmit, readOnly, disabled, shortDesc, partialTriggers, label, tip, sim= ple, text, accessKey, textAndAccessKey, onfocus, onblur, onchange, onclick,= ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, = onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, showRequired, vali= gn, messageDescUrl, messageTargetFrame, selected, immediate, required, vali= dator, valueChangeListener, requiredMessageDetail, value, converter, render= ed, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectBooleanCheckbox>" ICON=3D"" NAME=3D"selectBoole= anCheckbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectBooleanChec= kbox>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectM= anyCheckbox></code> <code></af:selectManyCheckbox= ></code> Attributes: <code>id, layout= , valuePassThru, readOnly, disabled, shortDesc, partialTriggers, label, tip= , simple, onfocus, onblur, onchange, onclick, ondblclick, onmousedown, onmo= useup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup= , styleClass, inlineStyle, showRequired, valign, messageDescUrl, messageTar= getFrame, accessKey, labelAndAccessKey, autoSubmit, immediate, required, va= lidator, valueChangeListener, requiredMessageDetail, value, converter, rend= ered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</selectManyCheckbox>" ICON=3D"" NAME=3D"selectManyChec= kbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectManyCheckbo= x>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:showOne= Choice></code> <code></af:showOneChoice>&l= t;/code> Attributes: <code>id, label, accessKey= , labelAndAccessKey, shortDesc, partialTriggers, onclick, ondblclick, onmou= sedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeyd= own, onkeyup, styleClass, inlineStyle, position, alignment, rendered, bindi= ng, attributeChangeListener</code>" + ENDTEXT=3D"</showOneChoice>" ICON=3D"" NAME=3D"showOneChoice" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<showOneChoice>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:menuTre= e></code> <code></af:menuTree></code>&l= t;br>Attributes: <code>id, shortDesc, partialTriggers= , onclick, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, on= mouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, value, t= reeState, startDepth, var, varStatus, immediate, disclosureListener, render= ed, binding, attributeChangeListener</code>" + ENDTEXT=3D"</menuTree>" ICON=3D"" NAME=3D"menuTree" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<menuTree>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:command= MenuItem></code> <code></af:commandMenuItem&g= t;</code> Attributes: <code>id, text, icon, = selected, disabled, readOnly, textAndAccessKey, accessKey, type, shortDesc,= partialTriggers, useWindow, windowWidth, windowHeight, onclick, ondblclick= , onmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress,= onkeydown, onkeyup, styleClass, inlineStyle, action, actionListener, retur= nListener, launchListener, immediate, rendered, binding, attributeChangeLis= tener</code>" + ENDTEXT=3D"</commandMenuItem>" ICON=3D"" NAME=3D"commandMenuItem" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandMenuItem>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelFo= rm></code> <code></af:panelForm></code>= Attributes: <code>id, rows, maxColumns, width,= labelWidth, fieldWidth, shortDesc, partialTriggers, onclick, ondblclick, o= nmousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, on= keydown, onkeyup, styleClass, inlineStyle, rendered, binding, attributeChan= geListener</code>" + ENDTEXT=3D"</panelForm>" ICON=3D"" NAME=3D"panelForm" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<panelForm>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectI= nputDate></code> <code></af:selectInputDate&g= t;</code> Attributes: <code>id, chooseId, re= adOnly, disabled, shortDesc, partialTriggers, label, tip, simple, columns, = maximumLength, onfocus, onblur, onchange, onclick, ondblclick, onmousedown,= onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, on= keyup, styleClass, inlineStyle, showRequired, valign, messageDescUrl, messa= geTargetFrame, accessKey, labelAndAccessKey, autoSubmit, action, actionList= ener, returnListener, immediate, required, validator, valueChangeListener, = requiredMessageDetail, value, converter, rendered, binding, attributeChange= Listener</code>" + ENDTEXT=3D"</selectInputDate>" ICON=3D"" NAME=3D"selectInputDate" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectInputDate>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:iterato= r></code> <code></af:iterator></code>&l= t;br>Attributes: <code>id, var, varStatus, value, row= s, first, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</iterator>" ICON=3D"" NAME=3D"iterator" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<iterator>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelBo= x></code> <code></af:panelBox></code>&l= t;br>Attributes: <code>id, width, background, text, i= con, shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseu= p, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, st= yleClass, inlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelBox>" ICON=3D"" NAME=3D"panelBox" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<panelBox>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:selectO= rderShuttle></code> <code></af:selectOrderShuttle= ></code> Attributes: <code>id, reorde= rOnly, valuePassThru, readOnly, disabled, shortDesc, partialTriggers, onfoc= us, onblur, onchange, onclick, ondblclick, onmousedown, onmouseup, onmouseo= ver, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, i= nlineStyle, size, leadingHeader, trailingHeader, leadingDescShown, trailing= DescShown, label, immediate, required, validator, valueChangeListener, requ= iredMessageDetail, value, converter, rendered, binding, attributeChangeList= ener</code>" + ENDTEXT=3D"</selectOrderShuttle>" ICON=3D"" NAME=3D"selectOrderShu= ttle" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<selectOrderShuttl= e>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:panelLa= belAndMessage></code> <code></af:panelLabelAndMes= sage></code> Attributes: <code>id, sh= owRequired, shortDesc, partialTriggers, onclick, ondblclick, onmousedown, o= nmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onke= yup, styleClass, inlineStyle, label, valign, messageDescUrl, messageTargetF= rame, messageType, tip, message, anchor, contentStyleClass, accessKey, labe= lAndAccessKey, for, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</panelLabelAndMessage>" ICON=3D"" NAME=3D"panelLabelAn= dMessage" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panelLabelAndMess= age>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:command= Link></code> <code></af:commandLink></c= ode> Attributes: <code>id, text, disabled, text= AndAccessKey, accessKey, onfocus, onblur, partialSubmit, shortDesc, partial= Triggers, useWindow, windowWidth, windowHeight, onclick, ondblclick, onmous= edown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onkeydo= wn, onkeyup, styleClass, inlineStyle, blocking, action, actionListener, ret= urnListener, launchListener, immediate, rendered, binding, attributeChangeL= istener</code>" + ENDTEXT=3D"</commandLink>" ICON=3D"" NAME=3D"commandLink" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<commandLink>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><af:outputF= ormatted></code> <code></af:outputFormatted&g= t;</code> Attributes: <code>id, styleUsage, = shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, on= mouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleCl= ass, inlineStyle, value, converter, rendered, binding, attributeChangeListe= ner</code>" + ENDTEXT=3D"</outputFormatted>" ICON=3D"" NAME=3D"outputFormatted" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<outputFormatted>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + Syntax: <code><afh:frame&= amp;gt;</code> <code></afh:frame></code><br= >Attributes: <code>id, source, longDescURL, name, wid= th, height, marginWidth, marginHeight, scrolling, shortDesc, partialTrigger= s, styleClass, inlineStyle, rendered, binding, attributeChangeListener</= code>" + ENDTEXT=3D"</frame>" ICON=3D"" NAME=3D"frame" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<frame>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><afh:html&a= mp;gt;</code> <code></afh:html></code> &= lt;b>Attributes: <code>id, rendered, binding, attributeChan= geListener</code>" + ENDTEXT=3D"</html>" ICON=3D"" NAME=3D"html" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<html>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><afh:script= ></code> <code></afh:script></code><= br>Attributes: <code>id, text, source, generatesConte= nt, partialTriggers, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</script>" ICON=3D"" NAME=3D"script" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<script>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><%@ taglib = uri=3D"http://xmlns.oracle.com/adf/faces/html" prefix=3D"afh= " %></code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"ADF Faces = HTML taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://xmlns.oracle.com/adf/fa= ces/html" prefix=3D"afh" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><afh:head&a= mp;gt;</code> <code></afh:head></code> &= lt;b>Attributes: <code>id, title, partialTriggers, rendered= , binding, attributeChangeListener</code>" + ENDTEXT=3D"</head>" ICON=3D"" NAME=3D"head" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<head>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><afh:rowLay= out></code> <code></afh:rowLayout></cod= e> Attributes: <code>id, halign, valign, width,= shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup, o= nmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleC= lass, inlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</rowLayout>" ICON=3D"" NAME=3D"rowLayout" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<rowLayout>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><afh:styleS= heet></code> <code></afh:styleSheet></c= ode> Attributes: <code>id, rendered, binding, a= ttributeChangeListener</code>" + ENDTEXT=3D"</styleSheet>" ICON=3D"" NAME=3D"styleSheet" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<styleSheet>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><afh:frameB= orderLayout></code> <code></afh:frameBorderLayout= ></code> Attributes: <code>id, onload= , onunload, width, height, shortDesc, partialTriggers, styleClass, inlineSt= yle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</frameBorderLayout>" ICON=3D"" NAME=3D"frameBorderLayo= ut" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<frameBorderLayout= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><afh:cellFo= rmat></code> <code></afh:cellFormat></c= ode> Attributes: <code>id, shortText, halign, v= align, width, height, columnSpan, rowSpan, wrappingDisabled, headers, heade= r, shortDesc, partialTriggers, onclick, ondblclick, onmousedown, onmouseup,= onmouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, styl= eClass, inlineStyle, rendered, binding, attributeChangeListener</code>" + ENDTEXT=3D"</cellFormat>" ICON=3D"" NAME=3D"cellFormat" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<cellFormat>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><afh:tableL= ayout></code> <code></afh:tableLayout><= /code> Attributes: <code>id, width, halign, cel= lSpacing, cellPadding, borderWidth, summary, shortDesc, partialTriggers, on= click, ondblclick, onmousedown, onmouseup, onmouseover, onmousemove, onmous= eout, onkeypress, onkeydown, onkeyup, styleClass, inlineStyle, rendered, bi= nding, attributeChangeListener</code>" + ENDTEXT=3D"</tableLayout>" ICON=3D"" NAME=3D"tableLayout" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<tableLayout>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><afh:body&a= mp;gt;</code> <code></afh:body></code> &= lt;b>Attributes: <code>id, firstClickPassed, shortDesc, par= tialTriggers, onclick, ondblclick, onmousedown, onmouseup, onmouseover, onm= ousemove, onmouseout, onkeypress, onkeydown, onkeyup, styleClass, inlineSty= le, onload, onunload, initialFocusId, rendered, binding, attributeChangeLis= tener</code>" + ENDTEXT=3D"</body>" ICON=3D"" NAME=3D"body" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<body>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + + + + \ No newline at end of file Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/j= sf-palette.xml ___________________________________________________________________ Name: svn:mime-type + text/plain --===============5568793991908270793==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 11:08:38 2009 Content-Type: multipart/mixed; boundary="===============7964371429500099518==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17618 - in trunk/seam/plugins/org.jboss.tools.seam.xml: resources/meta and 1 other directory. Date: Wed, 16 Sep 2009 11:08:38 -0400 Message-ID: <200909161508.n8GF8cv3018309@svn01.web.mwc.hst.phx2.redhat.com> --===============7964371429500099518== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-16 11:08:38 -0400 (Wed, 16 Sep 2009) New Revision: 17618 Added: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/jboss-palette= .xml Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4885 options and palette split to jsf struts and jboss Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-09-16 15:03= :54 UTC (rev 17617) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-09-16 15:08= :38 UTC (rev 17618) @@ -376,4 +376,11 @@ = + + + + + Added: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/jboss-pal= ette.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/jboss-palett= e.xml (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/jboss-palett= e.xml 2009-09-16 15:08:38 UTC (rev 17618) @@ -0,0 +1,689 @@ + + + + + + Syntax: <code><a4j:log&am= p;gt;</code> <code></a4j:log></code> <= ;b>Attributes: <code>binding, dir, height, hotkey, id, lang= , level, name, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmouse= down, onmousemove, onmouseout, onmouseover, onmouseup, popup, rendered, sty= le, styleClass, title, width</code>" + ENDTEXT=3D"</log>" ICON=3D"" NAME=3D"log" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<log>" large-icon=3D"" model-entity=3D"SharableMacroH= TML" /> + Syntax: <code><a4j:repeat= ></code> <code></a4j:repeat></code><= br>Attributes: <code>ajaxKeys, binding, componentStat= e, first, id, rendered, rowKeyConverter, rowKeyVar, rows, stateVar, value, = var</code>" + ENDTEXT=3D"</repeat>" ICON=3D"%Icons%/JBoss RichFaces/repeat" NAME= =3D"repeat" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<repeat>" large-ic= on=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:form&a= mp;gt;</code> <code></a4j:form></code> &= lt;b>Attributes: <code>accept, acceptCharset, ajaxSingle, a= jaxSubmit, binding, bypassUpdates, data, enctype, eventsQueue, focus, id, i= gnoreDupResponses, limitToList, onbeforedomupdate, oncomplete, onreset, ons= ubmit, prependId, process, reRender, rendered, requestDelay, status, target= , timeout</code>" + ENDTEXT=3D"</form>" ICON=3D"%Icons%/Struts HTML/form" NAME=3D"form" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<form>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:mediaO= utput></code> <code></a4j:mediaOutput><= /code> Attributes: <code>accesskey, align, arch= ive, binding, border, cacheable, charset, classid, codebase, codetype, conv= erter, coords, createContent, createContentExpression, declare, dir, elemen= t, expires, hreflang, hspace, id, ismap, lang, lastModified, mimeType, onbl= ur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedo= wn, onmousemove, onmouseout, onmouseover, onmouseup, rel, rendered, rev, se= ssion, shape, standby, style, styleClass, tabindex, target, title, type, ur= iAttribute, usemap, value, vspace</code>" + ENDTEXT=3D"</mediaOutput>" ICON=3D"" NAME=3D"mediaOutput" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<mediaOutput>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:loadBu= ndle></code> <code></a4j:loadBundle></c= ode> Attributes: <code>basename, binding, id, r= endered, var</code>" + ENDTEXT=3D"</loadBundle>" ICON=3D"" NAME=3D"loadBundle" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<loadBundle>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:region= ></code> <code></a4j:region></code><= br>Attributes: <code>ajaxListener, binding, id, immed= iate, renderRegionOnly, rendered, selfRendered</code>" + ENDTEXT=3D"</region>" ICON=3D"" NAME=3D"region" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<region>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><a4j:output= Panel></code> <code></a4j:outputPanel><= /code> Attributes: <code>ajaxRendered, binding,= dir, id, keepTransient, lang, layout, onclick, ondblclick, onkeydown, onke= ypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouse= up, rendered, style, styleClass, title</code>" + ENDTEXT=3D"</outputPanel>" ICON=3D"" NAME=3D"outputPanel" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<outputPanel>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:includ= e></code> <code></a4j:include></code>&l= t;br>Attributes: <code>ajaxRendered, binding, dir, id= , keepTransient, lang, layout, rendered, style, styleClass, title, viewId&l= t;/code>" + ENDTEXT=3D"</include>" ICON=3D"" NAME=3D"include" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<include>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:status= ></code> <code></a4j:status></code><= br>Attributes: <code>binding, dir, for, forceId, id, = lang, layout, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmoused= own, onmousemove, onmouseout, onmouseover, onmouseup, onstart, onstop, rend= ered, startStyle, startStyleClass, startText, stopStyle, stopStyleClass, st= opText, style, styleClass, title</code>" + ENDTEXT=3D"</status>" ICON=3D"" NAME=3D"status" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<status>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><a4j:htmlCo= mmandLink></code> <code></a4j:htmlCommandLink&= ;gt;</code> Attributes: <code>accesskey, act= ion, actionListener, binding, charset, coords, dir, disabled, hreflang, id,= immediate, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypre= ss, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, = rel, rendered, rev, shape, style, styleClass, tabindex, target, title, type= , value</code>" + ENDTEXT=3D"</htmlCommandLink>" ICON=3D"%Icons%/Struts HTML/link" + NAME=3D"htmlCommandLink" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<htmlCommandLink>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><%@ taglib = uri=3D"http://richfaces.org/a4j" prefix=3D"a4j" %&g= t;</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"JBoss Ajax= 4jsf taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://richfaces.org/a4j"= prefix=3D"a4j" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" > + Syntax: <code><a4j:push&a= mp;gt;</code> <code></a4j:push></code> &= lt;b>Attributes: <code>action, actionListener, ajaxSingle, = binding, bypassUpdates, data, enabled, eventProducer, eventsQueue, focus, i= d, ignoreDupResponses, immediate, interval, limitToList, onbeforedomupdate,= oncomplete, process, reRender, rendered, status, timeout</code>" + ENDTEXT=3D"</push>" ICON=3D"" NAME=3D"push" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<push>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><a4j:comman= dLink></code> <code></a4j:commandLink><= /code> Attributes: <code>accesskey, action, act= ionListener, ajaxSingle, binding, bypassUpdates, charset, coords, data, dir= , disabled, eventsQueue, focus, hreflang, id, ignoreDupResponses, immediate= , lang, limitToList, onbeforedomupdate, onblur, onclick, oncomplete, ondblc= lick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, on= mouseout, onmouseover, onmouseup, process, reRender, rel, rendered, request= Delay, rev, shape, status, style, styleClass, tabindex, target, timeout, ti= tle, type, value</code>" + ENDTEXT=3D"</commandLink>" ICON=3D"%Icons%/Struts HTML/link" NAME= =3D"commandLink" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<commandLink>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:page&a= mp;gt;</code> <code></a4j:page></code> &= lt;b>Attributes: <code>ajaxListener, binding, contentType, = dir, format, id, immediate, lang, namespace, onload, onunload, pageTitle, r= endered, selfRendered, style, styleClass, title</code>" + ENDTEXT=3D"</page>" ICON=3D"" NAME=3D"page" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<page>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><a4j:action= param></code> <code></a4j:actionparam><= /code> Attributes: <code>actionListener, assign= To, binding, converter, id, name, noEscape, value</code>" + ENDTEXT=3D"</actionparam>" ICON=3D"" NAME=3D"actionparam" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<actionparam>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:portle= t></code> <code></a4j:portlet></code>&l= t;br>Attributes: <code>binding, id, rendered</code= >" + ENDTEXT=3D"</portlet>" ICON=3D"" NAME=3D"portlet" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<portlet>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:loadSc= ript></code> <code></a4j:loadScript></c= ode> Attributes: <code>binding, id, rendered, &= lt;/code>" + ENDTEXT=3D"</loadScript>" ICON=3D"" NAME=3D"loadScript" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<loadScript>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:keepAl= ive></code> <code></a4j:keepAlive></cod= e> Attributes: <code>ajaxOnly, </code>" + ENDTEXT=3D"</keepAlive>" ICON=3D"" NAME=3D"keepAlive" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<keepAlive>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:loadSt= yle></code> <code></a4j:loadStyle></cod= e> Attributes: <code>binding, id, media, render= ed, </code>" + ENDTEXT=3D"</loadStyle>" ICON=3D"" NAME=3D"loadStyle" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<loadStyle>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:comman= dButton></code> <code></a4j:commandButton>= </code> Attributes: <code>accesskey, action,= actionListener, ajaxSingle, alt, binding, bypassUpdates, data, dir, disabl= ed, eventsQueue, focus, id, ignoreDupResponses, image, immediate, lang, lim= itToList, onbeforedomupdate, onblur, onchange, onclick, oncomplete, ondblcl= ick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onm= ouseout, onmouseover, onmouseup, process, reRender, rendered, requestDelay,= size, status, style, styleClass, tabindex, timeout, title, type, value<= /code>" + ENDTEXT=3D"</commandButton>" ICON=3D"%Icons%/Struts HTML/button" + NAME=3D"commandButton" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<commandButton>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:poll&a= mp;gt;</code> <code></a4j:poll></code> &= lt;b>Attributes: <code>action, actionListener, ajaxSingle, = binding, bypassUpdates, data, enabled, eventsQueue, focus, id, ignoreDupRes= ponses, immediate, interval, limitToList, onbeforedomupdate, oncomplete, on= submit, process, reRender, rendered, status, timeout</code>" + ENDTEXT=3D"</poll>" ICON=3D"" NAME=3D"poll" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<poll>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><a4j:ajaxLi= stener></code> <code></a4j:ajaxListener>&l= t;/code> Attributes: <code></code>" + ENDTEXT=3D"</ajaxListener>" ICON=3D"" NAME=3D"ajaxListener" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<ajaxListener>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:suppor= t></code> <code></a4j:support></code>&l= t;br>Attributes: <code>action, actionListener, ajaxSi= ngle, binding, bypassUpdates, data, disableDefault, disabled, event, events= Queue, focus, id, ignoreDupResponses, immediate, limitToList, onbeforedomup= date, oncomplete, onsubmit, process, reRender, rendered, requestDelay, stat= us, timeout</code>" + ENDTEXT=3D"</support>" ICON=3D"" NAME=3D"support" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<support>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><a4j:qu= eue /></code> Attributes: <code>bindi= ng, disabled, id, ignoreDupResponses, name, onbeforedomupdate, oncomplete, = onerror, onrequestdequeue, onrequestqueue, onsizeexceeded, onsubmit, reques= tDelay, size, sizeExceededBehavior, status, timeout</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JBoss RichFaces/queue" NAME=3D"queue= " REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<queue/>" large-icon=3D"" model-entity=3D"Sharabl= eMacroHTML"/> + + + Syntax: <code><rich:p= age></code> <code></rich:page></code>&l= t;br>Attributes: <code>binding, bodyClass, contentTyp= e, dir, footerClass, headerClass, id, lang, markupType, namespace, onload, = onunload, pageTitle, rendered, sidebarClass, sidebarPosition, sidebarWidth,= style, styleClass, theme, title, width</code>" + ENDTEXT=3D"</page>" ICON=3D"%Icons%/JBoss RichFaces/page" + NAME=3D"page" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;page>" + large-icon=3D"" model-entity=3D"SharableMacroHTML"/> + Syntax: <code><rich:l= ayout></code> <code></rich:layout></cod= e> Attributes: <code>binding, id, rendered</= code>" + ENDTEXT=3D"</layout>" ICON=3D"%Icons%/JBoss RichFaces/layout" + NAME=3D"layout" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<layout>" large-icon=3D"" model-entity=3D"Sharabl= eMacroHTML"/> + Syntax: <code><rich:l= ayoutPanel></code> <code></rich:layoutPanel&g= t;</code> Attributes: <code>binding, id, ren= dered, width, </code>" + ENDTEXT=3D"</layoutPanel>" + ICON=3D"%Icons%/JBoss RichFaces/layoutPanel" NAME=3D"layoutPanel" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<layoutPanel>" + large-icon=3D"" model-entity=3D"SharableMacroHTML"/> + Syntax: <code><rich:c= olorPicker></code> <code></rich:colorPicker&g= t;</code> Attributes: <code>binding, colorMo= de, converter, converterMessage, flat, id, immediate, onbeforeshow, onchang= e, onclick, ondblclick, onhide, onkeydown, onkeypress, onkeyup, onmousedown= , onmousemove, onmouseout, onmouseover, onmouseup, onselect, onshow, render= ed, required, requiredMessage, showEvent, validator, validatorMessage, valu= e, valueChangeListener</code>" + ENDTEXT=3D"</colorPicker>" + ICON=3D"%Icons%/JBoss RichFaces/colorPicker" NAME=3D"colorPicker" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<colorPicker>" + large-icon=3D"" model-entity=3D"SharableMacroHTML"/> + Syntax: <code><a4j:jsFunc= tion></code> <code></a4j:jsFunction></c= ode> Attributes: <code>action, actionListener, = ajaxSingle, binding, bypassUpdates, data, eventsQueue, focus, id, ignoreDup= Responses, immediate, limitToList, name, onbeforedomupdate, oncomplete, pro= cess, reRender, rendered, requestDelay, status, timeout</code>" + ENDTEXT=3D"</jsFunction>" ICON=3D"" NAME=3D"jsFunction" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<jsFunction>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> = + Syntax: <code><rich:hotKe= y></code> <code></rich:hotKey></code>&l= t;br>Attributes: <code>binding, checkParent, disableI= nInput, disableInInputTypes, handler, id, key, rendered, selector, timing, = type</code>" + ENDTEXT=3D"</hotKey>" ICON=3D"" NAME=3D"hotKey" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<hotKey>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><rich:tree&= amp;gt;</code> <code></rich:tree></code><br= >Attributes: <code>acceptCursors, acceptedTypes, advi= seNodeOpened, adviseNodeSelected, ajaxSingle, ajaxSubmitSelection, binding,= bypassUpdates, changeExpandListener, componentState, cursorTypeMapping, da= ta, dragIndicator, dragListener, dragType, dragValue, dropListener, dropVal= ue, eventsQueue, focus, grabCursors, grabbingCursors, highlightedClass, ico= n, iconCollapsed, iconExpanded, iconLeaf, id, ignoreDupResponses, immediate= , limitToList, nodeFace, nodeSelectListener, onbeforedomupdate, onclick, on= collapse, oncomplete, ondblclick, ondragend, ondragenter, ondragexit, ondra= gstart, ondrop, ondropend, ondropout, ondropover, onexpand, onkeydown, onke= ypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouse= up, onselected, preserveDataInRequest, preserveModel, process, reRender, re= jectCursors, ren! dered, requestDelay, rowKeyVar, selectedClass, showConnectingLines, stateA= dvisor, stateVar, status, style, styleClass, switchType, timeout, toggleOnC= lick, treeNodeVar, typeMapping, value, var</code>" + ENDTEXT=3D"</tree>" ICON=3D"%Icons%/JBoss RichFaces/tree" NAME=3D"= tree" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<tree>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:scrol= lableDataTable></code> <code></rich:scrollableDat= aTable></code> Attributes: <code>acti= veClass, activeRowKey, ajaxKeys, binding, bypassUpdates, columnClasses, com= ponentState, data, eventsQueue, first, footerClass, frozenColCount, headerC= lass, height, hideWhenScrolling, id, ignoreDupResponses, onRowClick, onRowD= blClick, onRowMouseDown, onRowMouseUp, onselectionchange, process, reRender= , rendered, requestDelay, rowClasses, rowKeyConverter, rowKeyVar, rows, scr= iptVar, selectedClass, selection, sortMode, sortOrder, stateVar, status, st= yle, styleClass, timeout, value, var, width</code>" + ENDTEXT=3D"</scrollableDataTable>" ICON=3D"%Icons%/JBoss RichFaces= /scrollableDataTable" + NAME=3D"scrollableDataTable" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<scrollableDataTable>" large-icon=3D"" model-entity= =3D"SharableMacroHTML" /> + Syntax: <code><rich:toggl= eControl></code> <code></rich:toggleControl&g= t;</code> Attributes: <code>accesskey, actio= n, actionListener, ajaxSingle, binding, bypassUpdates, data, dir, eventsQue= ue, focus, for, id, ignoreDupResponses, immediate, lang, limitToList, onbef= oredomupdate, onblur, onclick, oncomplete, ondblclick, onfocus, onkeydown, = onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onm= ouseup, panelId, process, rendered, requestDelay, status, style, styleClass= , switchToState, tabindex, timeout, title, value</code>" + ENDTEXT=3D"</toggleControl>" ICON=3D"" NAME=3D"toggleControl" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<toggleControl>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:sugge= stionbox></code> <code></rich:suggestionbox&g= t;</code> Attributes: <code>ajaxSingle, bgco= lor, binding, border, bypassUpdates, cellpadding, cellspacing, dir, entryCl= ass, eventsQueue, fetchValue, first, for, frame, frequency, id, ignoreDupRe= sponses, immediate, lang, limitToList, minChars, nothingLabel, onbeforedomu= pdate, oncomplete, onobjectchange, onselect, onsubmit, param, popupClass, p= opupStyle, process, reRender, rendered, requestDelay, rowClasses, rules, se= lectValueClass, selectedClass, selfRendered, shadowDepth, shadowOpacity, st= atus, style, styleClass, suggestionAction, summary, timeout, title, tokens,= usingSuggestObjects, var, zindex, </code>" + ENDTEXT=3D"</suggestionbox>" ICON=3D"%Icons%/JBoss RichFaces/sugge= stionBox" + NAME=3D"suggestionbox" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<suggestionbox>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:colum= ns></code> <code></rich:columns></code>= Attributes: <code>begin, breakBefore, colspan,= columns, comparator, dir, end, filterBy, filterEvent, filterExpression, fi= lterMethod, filterValue, footerClass, headerClass, id, index, label, lang, = rendered, rowspan, selfSorted, sortBy, sortExpression, sortIcon, sortIconAs= cending, sortIconDescending, sortOrder, sortable, style, styleClass, title,= value, var, visible, width</code>" + ENDTEXT=3D"</columns>" ICON=3D"" NAME=3D"columns" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<columns>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:calen= dar></code> <code></rich:calendar></cod= e> Attributes: <code>ajaxSingle, binding, bound= aryDatesMode, buttonClass, buttonIcon, buttonIconDisabled, buttonLabel, byp= assUpdates, cellHeight, cellWidth, converter, converterMessage, currentDate= , currentDateChangeListener, dataModel, datePattern, dayStyleClass, default= Time, direction, disabled, enableManualInput, eventsQueue, firstWeekDay, fo= cus, horizontalOffset, id, ignoreDupResponses, immediate, inputClass, input= Size, inputStyle, isDayEnabled, jointPoint, label, limitToList, locale, min= DaysInFirstWeek, mode, monthLabels, monthLabelsShort, onbeforedomupdate, on= changed, oncollapse, oncomplete, oncurrentdateselect, oncurrentdateselected= , ondatemouseout, ondatemouseover, ondateselect, ondateselected, onexpand, = oninputblur, oninputchange, oninputclick, oninputfocus, oninputkeydown, oni= nputkeypress, on! inputkeyup, oninputselect, ontimeselect, ontimeselected, popup, preloadDat= eRangeBegin, preloadDateRangeEnd, process, reRender, rendered, requestDelay= , required, requiredMessage, resetTimeOnDateSelect, showApplyButton, showFo= oter, showHeader, showInput, showWeekDaysBar, showWeeksBar, status, style, = styleClass, timeZone, timeout, todayControlMode, toolTipMode, validator, va= lidatorMessage, value, valueChangeListener, verticalOffset, weekDayLabels, = weekDayLabelsShort, zindex</code>" + ENDTEXT=3D"</calendar>" ICON=3D"%Icons%/JBoss RichFaces/Calendar" + NAME=3D"calendar" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;calendar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:compo= nentControl></code> <code></rich:componentControl= ></code> Attributes: <code>attachTimi= ng, attachTo, binding, disableDefault, event, for, id, name, operation, par= ams, rendered</code>" + ENDTEXT=3D"</componentControl>" ICON=3D"" NAME=3D"componentControl" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<componentControl>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:input= NumberSlider></code> <code></rich:inputNumberSlid= er></code> Attributes: <code>accesske= y, barClass, barStyle, binding, clientErrorMessage, converter, converterMes= sage, disabled, enableManualInput, handleClass, handleSelectedClass, id, im= mediate, inputClass, inputPosition, inputSize, inputStyle, label, maxValue,= maxlength, minValue, onblur, onchange, onclick, ondblclick, onerror, onfoc= us, oninputclick, oninputdblclick, oninputkeydown, oninputkeypress, oninput= keyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmouseove= r, oninputmouseup, onmousedown, onmousemove, onmouseout, onmouseover, onmou= seup, onselect, onslide, rendered, required, requiredMessage, showBoundaryV= alues, showInput, showToolTip, step, style, styleClass, tabindex, tipClass,= tipStyle, validator, validatorMessage, value, valueChangeListener, width&l= t;/code>" + ENDTEXT=3D"</inputNumberSlider>" ICON=3D"%Icons%/JBoss RichFaces/i= nputNumberSlider" + NAME=3D"inputNumberSlider" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<inputNumberSlider>" large-icon=3D"" model-entity=3D"= SharableMacroHTML" /> + Syntax: <code><rich:ajaxV= alidator></code> <code></rich:ajaxValidator&g= t;</code> Attributes: <code>ajaxListener, bi= nding, data, disableDefault, event, eventsQueue, focus, id, ignoreDupRespon= ses, limitToList, onbeforedomupdate, oncomplete, onsubmit, reRender, render= ed, requestDelay, status, summary, timeout</code>" + ENDTEXT=3D"</ajaxValidator>" ICON=3D"%Icons%/JSF Core/validator" + NAME=3D"ajaxValidator" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<ajaxValidator>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dndPa= ram></code> <code></rich:dndParam></cod= e> Attributes: <code>binding, id, rendered, typ= e, value, </code>" + ENDTEXT=3D"</dndParam>" ICON=3D"%Icons%/JBoss RichFaces/dndParam" + NAME=3D"dndParam" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;dndParam>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:menuI= tem></code> <code></rich:menuItem></cod= e> Attributes: <code>action, actionListener, aj= axSingle, binding, bypassUpdates, data, disabled, eventsQueue, focus, icon,= iconClass, iconDisabled, iconStyle, id, ignoreDupResponses, immediate, lab= elClass, limitToList, onbeforedomupdate, onclick, oncomplete, onmousedown, = onmousemove, onmouseout, onmouseover, onmouseup, onselect, process, reRende= r, rendered, requestDelay, selectClass, selectStyle, status, style, styleCl= ass, submitMode, target, timeout, value</code>" + ENDTEXT=3D"</menuItem>" ICON=3D"%Icons%/JBoss RichFaces/menuItem" + NAME=3D"menuItem" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;menuItem>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:modal= Panel></code> <code></rich:modalPanel><= /code> Attributes: <code>autosized, binding, co= ntrolsClass, headerClass, height, id, keepVisualState, label, left, minHeig= ht, minWidth, moveable, onbeforehide, onbeforeshow, onhide, onmaskclick, on= maskcontextmenu, onmaskdblclick, onmaskmousedown, onmaskmousemove, onmaskmo= useout, onmaskmouseover, onmaskmouseup, onmove, onresize, onshow, rendered,= resizeable, shadowDepth, shadowOpacity, showWhenRendered, style, styleClas= s, top, tridentIVEngineSelectBehavior, trimOverlayedElements, validator, va= lidatorMessage, value, visualOptions, width, zindex</code>" + ENDTEXT=3D"</modalPanel>" ICON=3D"%Icons%/JBoss RichFaces/modalPan= el" + NAME=3D"modalPanel" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"&= lt;modalPanel>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:fileU= pload></code> <code></rich:fileUpload><= /code> Attributes: <code>acceptedTypes, accessk= ey, addButtonClass, addButtonClassDisabled, addControlLabel, ajaxSingle, al= lowFlash, alt, autoclear, binding, cancelEntryControlLabel, cleanButtonClas= s, cleanButtonClassDisabled, clearAllControlLabel, clearControlLabel, disab= led, doneLabel, fileEntryClass, fileEntryClassDisabled, fileEntryControlCla= ss, fileEntryControlClassDisabled, fileUploadListener, id, immediate, immed= iateUpload, listHeight, listWidth, locale, maxFilesQuantity, noDuplicate, o= nadd, onblur, onchange, onclear, onclick, ondblclick, onerror, onfocus, onk= eydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseo= ver, onmouseup, onselect, onsizerejected, ontyperejected, onupload, onuploa= dcanceled, onuploadcomplete, progressLabel, rendered, required, requiredMes= sage, sizeErrorL! abel, status, stopButtonClass, stopButtonClassDisabled, stopControlLabel, = stopEntryControlLabel, style, styleClass, tabindex, transferErrorLabel, upl= oadButtonClass, uploadButtonClassDisabled, uploadControlLabel, uploadData, = uploadListClass, uploadListClassDisabled, validator, validatorMessage</c= ode>" + ENDTEXT=3D"</fileUpload>" ICON=3D"" NAME=3D"fileUpload" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<fileUpload>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:tabPa= nel></code> <code></rich:tabPanel></cod= e> Attributes: <code>activeTabClass, binding, c= ontentClass, contentStyle, converter, converterMessage, dir, disabledTabCla= ss, headerAlignment, headerClass, headerSpacing, height, id, immediate, ina= ctiveTabClass, label, lang, onclick, ondblclick, onkeydown, onkeypress, onk= eyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, ontabch= ange, rendered, required, requiredMessage, selectedTab, style, styleClass, = switchType, tabClass, title, validator, validatorMessage, value, valueChang= eListener, width</code>" + ENDTEXT=3D"</tabPanel>" ICON=3D"%Icons%/JBoss RichFaces/tabPanel" + NAME=3D"tabPanel" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;tabPanel>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:recur= siveTreeNodesAdaptor></code> <code></rich:recursi= veTreeNodesAdaptor></code> Attributes: &= lt;code>binding, id, included, includedNode, includedRoot, nodes, rendered,= roots, var</code>" + ENDTEXT=3D"</recursiveTreeNodesAdaptor>" ICON=3D"%Icons%/JBoss Ric= hFaces/recursiveTreeNodesAdaptor" + NAME=3D"recursiveTreeNodesAdaptor" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<recursiveTreeNodesAdaptor>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><%@ taglib = uri=3D"http://richfaces.org/rich" prefix=3D"rich" %&= ;gt;</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"JBoss Rich= Faces taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://richfaces.org/rich"= ; prefix=3D"rich" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:conte= xtMenu></code> <code></rich:contextMenu>&l= t;/code> Attributes: <code>attachTiming, attach= To, attached, binding, disableDefaultMenu, disabledItemClass, disabledItemS= tyle, event, hideDelay, id, itemClass, itemStyle, oncollapse, onexpand, ong= roupactivate, onitemselect, onmousemove, onmouseout, onmouseover, popupWidt= h, rendered, selectItemClass, selectItemStyle, showDelay, style, styleClass= , submitMode</code>" + ENDTEXT=3D"</contextMenu>" ICON=3D"%Icons%/JBoss RichFaces/context= Menu" + NAME=3D"contextMenu" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"= <contextMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:subTa= ble></code> <code></rich:subTable></cod= e> Attributes: <code>ajaxKeys, binding, columnC= lasses, componentState, filterMethod, filterValue, first, footerClass, head= erClass, id, onRowClick, onRowDblClick, onRowMouseDown, onRowMouseMove, onR= owMouseOut, onRowMouseOver, onRowMouseUp, onclick, ondblclick, onkeydown, o= nkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmo= useup, rendered, rowClasses, rowKeyConverter, rowKeyVar, rows, selfSorted, = sortExpression, sortMode, sortOrder, sortPriority, stateVar, value, var<= /code>" + ENDTEXT=3D"</subTable>" ICON=3D"%Icons%/JBoss RichFaces/dataTable" + NAME=3D"subTable" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;subTable>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dropS= upport></code> <code></rich:dropSupport>&l= t;/code> Attributes: <code>acceptCursors, accep= tedTypes, action, actionListener, ajaxSingle, binding, bypassUpdates, curso= rTypeMapping, data, disableDefault, dropListener, dropValue, eventsQueue, f= ocus, id, ignoreDupResponses, immediate, limitToList, onbeforedomupdate, on= complete, ondragenter, ondragexit, ondrop, ondropend, process, reRender, re= jectCursors, rendered, requestDelay, status, timeout, typeMapping, value<= ;/code>" + ENDTEXT=3D"</dropSupport>" ICON=3D"%Icons%/JBoss RichFaces/dropSup= port" + NAME=3D"dropSupport" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"= <dropSupport>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dragL= istener></code> <code></rich:dragListener>= </code> Attributes: <code>binding</code>" + ENDTEXT=3D"</dragListener>" ICON=3D"%Icons%/JBoss RichFaces/dragLi= stener" + NAME=3D"dragListener" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<dragListener>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:panel= Bar></code> <code></rich:panelBar></cod= e> Attributes: <code>binding, contentClass, con= tentStyle, converter, converterMessage, headerClass, headerClassActive, hea= derStyle, headerStyleActive, height, id, immediate, label, onclick, onitemc= hange, onmousemove, onmouseout, onmouseover, rendered, required, requiredMe= ssage, selectedPanel, style, styleClass, validator, validatorMessage, value= , valueChangeListener, width</code>" + ENDTEXT=3D"</panelBar>" ICON=3D"%Icons%/JBoss RichFaces/panelBar" + NAME=3D"panelBar" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;panelBar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:nodeS= electListener></code> <code></rich:nodeSelectList= ener></code> Attributes: <code>bindin= g</code>" + ENDTEXT=3D"</nodeSelectListener>" ICON=3D"" NAME=3D"nodeSelectList= ener" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<nodeSelectListene= r>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:datas= croller></code> <code></rich:datascroller>= </code> Attributes: <code>action, actionList= ener, ajaxSingle, align, binding, boundaryControls, bypassUpdates, data, ev= entsQueue, fastControls, fastStep, focus, for, handleValue, id, ignoreDupRe= sponses, immediate, inactiveStyle, inactiveStyleClass, limitToList, maxPage= s, onbeforedomupdate, onclick, oncomplete, ondblclick, onkeydown, onkeypres= s, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, o= npagechange, page, pageIndexVar, pagesVar, process, reRender, renderIfSingl= ePage, rendered, requestDelay, scrollerListener, selectedStyle, selectedSty= leClass, status, stepControls, style, styleClass, tableStyle, tableStyleCla= ss, timeout, value</code>" + ENDTEXT=3D"</datascroller>" ICON=3D"%Icons%/JBoss RichFaces/dataSc= roller" + NAME=3D"datascroller" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<datascroller>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:menuS= eparator /></code> Attributes: <code>= binding, id, rendered</code>" + ENDTEXT=3D"" ICON=3D"%Icons%/JBoss RichFaces/menuSeparator" NAME=3D"m= enuSeparator" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<menuSeparator/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dropL= istener></code> <code></rich:dropListener>= </code> Attributes: <code>binding</code>" + ENDTEXT=3D"</dropListener>" ICON=3D"%Icons%/JBoss RichFaces/dropLi= stener" + NAME=3D"dropListener" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<dropListener>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dragS= upport></code> <code></rich:dragSupport>&l= t;/code> Attributes: <code>action, actionListen= er, ajaxSingle, binding, bypassUpdates, data, disableDefault, dragIndicator= , dragListener, dragType, dragValue, eventsQueue, focus, grabCursors, grabb= ingCursors, id, ignoreDupResponses, immediate, limitToList, onbeforedomupda= te, oncomplete, ondragend, ondragstart, ondropout, ondropover, process, reR= ender, rendered, requestDelay, status, timeout, value</code>" + ENDTEXT=3D"</dragSupport>" ICON=3D"%Icons%/JBoss RichFaces/dragSup= port" + NAME=3D"dragSupport" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"= <dragSupport>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:virtu= alEarth></code> <code></rich:virtualEarth>= </code> Attributes: <code>binding, dashboard= Size, id, lat, lng, mapStyle, onLoadMap, onclick, ondblclick, onkeydown, on= keypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmou= seup, rendered, style, styleClass, var, version, zoom</code>" + ENDTEXT=3D"</virtualEarth>" ICON=3D"%Icons%/JBoss RichFaces/virtua= lEarth" + NAME=3D"virtualEarth" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<virtualEarth>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:panel= MenuItem></code> <code></rich:panelMenuItem&g= t;</code> Attributes: <code>action, actionLi= stener, ajaxSingle, binding, bypassUpdates, data, disabled, disabledClass, = disabledStyle, eventsQueue, focus, hoverClass, hoverStyle, icon, iconClass,= iconDisabled, iconStyle, id, ignoreDupResponses, immediate, label, limitTo= List, mode, name, onbeforedomupdate, onclick, oncomplete, ondblclick, onkey= down, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseove= r, onmouseup, process, reRender, rendered, requestDelay, status, style, sty= leClass, target, timeout, value</code>" + ENDTEXT=3D"</panelMenuItem>" ICON=3D"%Icons%/JBoss RichFaces/panel= MenuItem" + NAME=3D"panelMenuItem" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<panelMenuItem>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dropD= ownMenu></code> <code></rich:dropDownMenu>= </code> Attributes: <code>binding, direction= , disabled, disabledItemClass, disabledItemStyle, disabledLabelClass, event= , hideDelay, horizontalOffset, id, itemClass, itemStyle, jointPoint, oncoll= apse, onexpand, ongroupactivate, onitemselect, onmousemove, onmouseout, onm= ouseover, popupWidth, rendered, selectItemClass, selectItemStyle, selectedL= abelClass, showDelay, style, styleClass, submitMode, value, verticalOffset&= lt;/code>" + ENDTEXT=3D"</dropDownMenu>" ICON=3D"%Icons%/JBoss RichFaces/dropDo= wnMenu" + NAME=3D"dropDownMenu" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<dropDownMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:paint= 2D></code> <code></rich:paint2D></code>= Attributes: <code>align, bgcolor, binding, bor= der, cacheable, data, format, height, hspace, id, lang, paint, rendered, st= yle, styleClass, title, value, vspace, width</code>" + ENDTEXT=3D"</paint2D>" ICON=3D"%Icons%/JBoss RichFaces/paint2D" + NAME=3D"paint2D" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= paint2D>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dataD= efinitionList></code> <code></rich:dataDefinition= List></code> Attributes: <code>ajaxKe= ys, binding, columnClasses, componentState, dir, first, id, lang, rendered,= rowClasses, rowKey, rowKeyConverter, rowKeyVar, rows, style, styleClass, t= itle, value, var</code>" + ENDTEXT=3D"</dataDefinitionList>" ICON=3D"%Icons%/JBoss RichFaces/= dataDefinitionList" + NAME=3D"dataDefinitionList" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<dataDefinitionList>" large-icon=3D"" model-entity=3D= "SharableMacroHTML" /> + Syntax: <code><rich:input= NumberSpinner></code> <code></rich:inputNumberSpi= nner></code> Attributes: <code>access= key, binding, clientErrorMessage, converter, converterMessage, cycled, disa= bleBrowserAutoComplete, disabled, enableManualInput, id, immediate, inputCl= ass, inputSize, inputStyle, label, maxValue, minValue, onblur, onchange, on= click, ondblclick, ondownclick, onerror, onfocus, oninputclick, oninputdblc= lick, oninputkeydown, oninputkeypress, oninputkeyup, oninputmousedown, onin= putmousemove, oninputmouseout, oninputmouseover, oninputmouseup, onmousedow= n, onmousemove, onmouseout, onmouseover, onmouseup, onselect, onupclick, re= ndered, required, requiredMessage, step, style, styleClass, tabindex, valid= ator, validatorMessage, value, valueChangeListener</code>" + ENDTEXT=3D"</inputNumberSpinner>" ICON=3D"%Icons%/JBoss RichFaces/= inputNumberSpinner" + NAME=3D"inputNumberSpinner" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<inputNumberSpinner>" large-icon=3D"" model-entity=3D= "SharableMacroHTML" /> + Syntax: <code><rich:dataG= rid></code> <code></rich:dataGrid></cod= e> Attributes: <code>ajaxKeys, align, bgcolor, = binding, border, captionClass, captionStyle, cellpadding, cellspacing, colu= mnClasses, columns, componentState, dir, elements, first, footerClass, fram= e, headerClass, id, lang, onRowClick, onRowDblClick, onRowMouseDown, onRowM= ouseMove, onRowMouseOut, onRowMouseOver, onRowMouseUp, onclick, ondblclick,= onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmo= useover, onmouseup, rendered, rowClasses, rowKey, rowKeyConverter, rowKeyVa= r, rules, stateVar, style, styleClass, summary, title, value, var, width<= ;/code>" + ENDTEXT=3D"</dataGrid>" ICON=3D"%Icons%/JBoss RichFaces/dataGrid" + NAME=3D"dataGrid" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;dataGrid>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:state= ></code> <code></rich:state></code><= br>Attributes: <code>binding, id, rendered</code>" + ENDTEXT=3D"</state>" ICON=3D"" NAME=3D"state" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<state>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><rich:menuG= roup></code> <code></rich:menuGroup></c= ode> Attributes: <code>binding, converter, dire= ction, disabled, event, icon, iconClass, iconDisabled, iconFolder, iconFold= erDisabled, iconStyle, id, labelClass, onclose, onmousemove, onmouseout, on= mouseover, onopen, rendered, selectClass, selectStyle, showDelay, style, st= yleClass, </code>" + ENDTEXT=3D"</menuGroup>" ICON=3D"%Icons%/JBoss RichFaces/menuGroup" + NAME=3D"menuGroup" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"&l= t;menuGroup>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:messa= ges></code> <code></rich:messages></cod= e> Attributes: <code>ajaxRendered, binding, err= orClass, errorLabelClass, errorMarkerClass, fatalClass, fatalLabelClass, fa= talMarkerClass, for, globalOnly, id, infoClass, infoLabelClass, infoMarkerC= lass, keepTransient, labelClass, layout, level, markerClass, markerStyle, p= assedLabel, rendered, showDetail, showSummary, style, styleClass, title, to= oltip, warnClass, warnLabelClass, warnMarkerClass</code>" + ENDTEXT=3D"</messages>" ICON=3D"%Icons%/JBoss RichFaces/messages" + NAME=3D"messages" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;messages>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:combo= Box></code> <code></rich:comboBox></cod= e> Attributes: <code>align, binding, buttonClas= s, buttonDisabledClass, buttonDisabledStyle, buttonIcon, buttonIconDisabled= , buttonIconInactive, buttonInactiveClass, buttonInactiveStyle, buttonStyle= , converter, converterMessage, defaultLabel, directInputSuggestions, disabl= ed, enableManualInput, filterNewValues, hideDelay, id, immediate, inputClas= s, inputDisabledClass, inputDisabledStyle, inputInactiveClass, inputInactiv= eStyle, inputStyle, itemClass, itemSelectedClass, listClass, listHeight, li= stStyle, listWidth, onblur, onchange, onclick, ondblclick, onfocus, onkeydo= wn, onkeypress, onkeyup, onlistcall, onmousedown, onmousemove, onmouseout, = onmouseover, onmouseup, onselect, rendered, required, requiredMessage, sele= ctFirstOnUpdate, showDelay, style, styleClass, suggestionValues, tabindex, = validator, valid! atorMessage, value, valueChangeListener, width</code>" + ENDTEXT=3D"</comboBox>" ICON=3D"%Icons%/Struts HTML/select" NAME= =3D"comboBox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<comboBox>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:graph= Validator></code> <code></rich:graphValidator&= ;gt;</code> Attributes: <code>binding, id, p= rofile, summary, value</code>" + ENDTEXT=3D"</graphValidator>" ICON=3D"%Icons%/JSF Core/validator" + NAME=3D"graphValidator" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<graphValidator>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dataO= rderedList></code> <code></rich:dataOrderedList&a= mp;gt;</code> Attributes: <code>ajaxKeys, bi= nding, dir, first, id, lang, rendered, rowClasses, rowKey, rowKeyConverter,= rowKeyVar, rows, style, styleClass, title, type, value, var</code>" + ENDTEXT=3D"</dataOrderedList>" ICON=3D"%Icons%/JBoss RichFaces/dat= aOrderedList" + NAME=3D"dataOrderedList" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<dataOrderedList>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:inpla= ceInput></code> <code></rich:inplaceInput>= </code> Attributes: <code>binding, cancelCon= trolIcon, changedClass, changedHoverClass, controlClass, controlHoverClass,= controlPressedClass, controlsHorizontalPosition, controlsVerticalPosition,= converter, converterMessage, defaultLabel, editClass, editEvent, id, immed= iate, inputWidth, layout, maxInputWidth, minInputWidth, onblur, onchange, o= nclick, ondblclick, oneditactivated, oneditactivation, onfocus, oninputclic= k, oninputdblclick, oninputkeydown, oninputkeypress, oninputkeyup, oninputm= ousedown, oninputmousemove, oninputmouseout, oninputmouseover, oninputmouse= up, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, o= nmouseover, onmouseup, onselect, onviewactivated, onviewactivation, rendere= d, required, requiredMessage, saveControlIcon, selectOnEdit, showControls, = styleClass, tabi! ndex, validator, validatorMessage, value, valueChangeListener, viewClass, = viewHoverClass</code>" + ENDTEXT=3D"</inplaceInput>" ICON=3D"" NAME=3D"inplaceInput" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<inplaceInput>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:colum= n></code> <code></rich:column></code>&l= t;br>Attributes: <code>binding, breakBefore, colspan,= comparator, dir, filterBy, filterEvent, filterExpression, filterMethod, fi= lterValue, footerClass, headerClass, id, label, lang, rendered, rowspan, se= lfSorted, sortBy, sortExpression, sortIcon, sortIconAscending, sortIconDesc= ending, sortOrder, sortable, style, styleClass, title, visible, width</c= ode>" + ENDTEXT=3D"</column>" ICON=3D"%Icons%/JBoss RichFaces/column" NAME= =3D"column" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<column>" large-ic= on=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:messa= ge></code> <code></rich:message></code>= Attributes: <code>ajaxRendered, binding, error= Class, errorLabelClass, errorMarkerClass, fatalClass, fatalLabelClass, fata= lMarkerClass, for, id, infoClass, infoLabelClass, infoMarkerClass, keepTran= sient, labelClass, level, markerClass, markerStyle, passedLabel, rendered, = showDetail, showSummary, style, styleClass, title, tooltip, warnClass, warn= LabelClass, warnMarkerClass</code>" + ENDTEXT=3D"</message>" ICON=3D"%Icons%/JBoss RichFaces/message" + NAME=3D"message" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= message>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dataL= ist></code> <code></rich:dataList></cod= e> Attributes: <code>ajaxKeys, binding, compone= ntState, dir, first, id, lang, rendered, rowClasses, rowKey, rowKeyConverte= r, rowKeyVar, rows, stateVar, style, styleClass, title, type, value, var<= ;/code>" + ENDTEXT=3D"</dataList>" ICON=3D"%Icons%/JBoss RichFaces/dataList" + NAME=3D"dataList" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;dataList>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:toolB= arGroup></code> <code></rich:toolBarGroup>= </code> Attributes: <code>binding, id, itemS= eparator, location, onclick, ondblclick, onitemclick, onitemdblclick, onite= mkeydown, onitemkeypress, onitemkeyup, onitemmousedown, onitemmousemove, on= itemmouseout, onitemmouseover, onitemmouseup, onkeydown, onkeypress, onkeyu= p, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, rendered, = separatorClass, style, styleClass</code>" + ENDTEXT=3D"</toolBarGroup>" ICON=3D"%Icons%/JBoss RichFaces/toolBa= rGroup" + NAME=3D"toolBarGroup" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<toolBarGroup>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:panel= Menu></code> <code></rich:panelMenu></c= ode> Attributes: <code>binding, converter, conv= erterMessage, disabled, disabledGroupClass, disabledGroupStyle, disabledIte= mClass, disabledItemStyle, event, expandMode, expandSingle, groupClass, gro= upStyle, hoveredGroupClass, hoveredGroupStyle, hoveredItemClass, hoveredIte= mStyle, iconCollapsedGroup, iconCollapsedTopGroup, iconDisabledGroup, iconD= isabledItem, iconExpandedGroup, iconExpandedTopGroup, iconGroupPosition, ic= onGroupTopPosition, iconItem, iconItemPosition, iconItemTopPosition, iconTo= pDisableGroup, iconTopDisabledItem, iconTopItem, id, immediate, itemClass, = itemStyle, label, mode, onclick, ondblclick, ongroupcollapse, ongroupexpand= , onitemhover, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, on= mouseout, onmouseover, onmouseup, rendered, required, requiredMessage, sele= ctedChild, style! , styleClass, topGroupClass, topGroupStyle, topItemClass, topItemStyle, va= lidator, validatorMessage, value, valueChangeListener, width</code>" + ENDTEXT=3D"</panelMenu>" ICON=3D"%Icons%/JBoss RichFaces/panelMenu" + NAME=3D"panelMenu" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"&l= t;panelMenu>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:jQuer= y></code> <code></rich:jQuery></code>&l= t;br>Attributes: <code>binding, id, name, rendered, s= elector, timing, </code>" + ENDTEXT=3D"</jQuery>" ICON=3D"" NAME=3D"jQuery" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<jQuery>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><rich:gmap&= amp;gt;</code> <code></rich:gmap></code><br= >Attributes: <code>binding, enableContinuousZoom, ena= bleDoubleClickZoom, enableDragging, enableInfoWindow, gmapKey, gmapVar, id,= lat, lng, locale, mapType, onclick, ondblclick, oninit, onkeydown, onkeypr= ess, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup,= rendered, showGLargeMapControl, showGMapTypeControl, showGScaleControl, st= yle, styleClass, warningMessage, zoom</code>" + ENDTEXT=3D"</gmap>" ICON=3D"%Icons%/JBoss RichFaces/gmap" NAME=3D"= gmap" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<gmap>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:order= ingList></code> <code></rich:orderingList>= </code> Attributes: <code>activeItem, ajaxKe= ys, binding, bottomControlLabel, captionLabel, columnClasses, componentStat= e, controlsHorizontalAlign, controlsType, controlsVerticalAlign, converter,= downControlLabel, fastOrderControlsVisible, id, immediate, listHeight, lis= tWidth, onbottomclick, onclick, ondblclick, ondownclick, onheaderclick, onm= ousemove, onmouseout, onmouseover, onorderchanged, ontopclick, onupclick, o= rderControlsVisible, rendered, required, rowClasses, rowKeyConverter, rowKe= yVar, rows, selection, showButtonLabels, style, styleClass, topControlLabel= , upControlLabel, validator, value, valueChangeListener, var</code>" + ENDTEXT=3D"</orderingList>" ICON=3D"%Icons%/JBoss RichFaces/orderi= ngList" + NAME=3D"orderingList" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<orderingList>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:inpla= ceSelect></code> <code></rich:inplaceSelect&g= t;</code> Attributes: <code>binding, cancelC= ontrolIcon, changedClass, controlClass, controlHoverClass, controlPressClas= s, controlsHorizontalPosition, controlsVerticalPosition, converter, convert= erMessage, defaultLabel, editClass, editEvent, id, immediate, layout, listH= eight, listWidth, maxSelectWidth, minSelectWidth, onblur, onchange, onclick= , ondblclick, oneditactivated, oneditactivation, onfocus, oninputblur, onin= putclick, oninputdblclick, oninputfocus, oninputkeydown, oninputkeypress, o= ninputkeyup, oninputmousedown, oninputmousemove, oninputmouseout, oninputmo= useover, oninputmouseup, onkeydown, onkeypress, onkeyup, onmousedown, onmou= semove, onmouseout, onmouseover, onmouseup, onselect, onviewactivated, onvi= ewactivation, openOnEdit, rendered, required, requiredMessage, saveControlI= con, selectWidth! , showControls, styleClass, tabindex, validator, validatorMessage, value, = valueChangeListener, viewClass, viewHoverClass</code>" + ENDTEXT=3D"</inplaceSelect>" ICON=3D"" NAME=3D"inplaceSelect" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<inplaceSelect>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:beanV= alidator></code> <code></rich:beanValidator&g= t;</code> Attributes: <code>binding, summary= </code>" + ENDTEXT=3D"</beanValidator>" ICON=3D"%Icons%/JSF Core/validator" + NAME=3D"beanValidator" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<beanValidator>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:effec= t></code> <code></rich:effect></code>&l= t;br>Attributes: <code>binding, disableDefault, event= , for, id, name, params, rendered, targetId, type</code>" + ENDTEXT=3D"</effect>" ICON=3D"%Icons%/JBoss RichFaces/effect" NAME= =3D"effect" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<effect>" large-ic= on=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:separ= ator></code> <code></rich:separator></c= ode> Attributes: <code>align, binding, height, = id, lineType, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmoused= own, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, styl= eClass, title, width</code>" + ENDTEXT=3D"</separator>" ICON=3D"%Icons%/JBoss RichFaces/separator" + NAME=3D"separator" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"&l= t;separator>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:toolB= ar></code> <code></rich:toolBar></code>= Attributes: <code>binding, contentClass, conte= ntStyle, height, id, itemSeparator, onclick, ondblclick, onitemclick, onite= mdblclick, onitemkeydown, onitemkeypress, onitemkeyup, onitemmousedown, oni= temmousemove, onitemmouseout, onitemmouseover, onitemmouseup, onkeydown, on= keypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmou= seup, rendered, separatorClass, style, styleClass, width</code>" + ENDTEXT=3D"</toolBar>" ICON=3D"%Icons%/JBoss RichFaces/toolBar" + NAME=3D"toolBar" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= toolBar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:dragI= ndicator></code> <code></rich:dragIndicator&g= t;</code> Attributes: <code>acceptClass, bin= ding, id, rejectClass, rendered, style, styleClass</code>" + ENDTEXT=3D"</dragIndicator>" ICON=3D"%Icons%/JBoss RichFaces/dragI= ndicator" + NAME=3D"dragIndicator" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<dragIndicator>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:inser= t></code> <code></rich:insert></code>&l= t;br>Attributes: <code>binding, content, encoding, er= rorContent, highlight, id, rendered, src</code>" + ENDTEXT=3D"</insert>" ICON=3D"" NAME=3D"insert" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<insert>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><rich:chang= eExpandListener></code> <code></rich:changeExpand= Listener></code> Attributes: <code>bi= nding</code>" + ENDTEXT=3D"</changeExpandListener>" ICON=3D"" NAME=3D"changeExpand= Listener" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<changeExpandListe= ner>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:toolT= ip></code> <code></rich:toolTip></code>= Attributes: <code>action, actionListener, ajax= Single, attached, binding, direction, disabled, event, followMouse, for, hi= deDelay, hideEvent, horizontalOffset, id, immediate, layout, mode, onclick,= oncomplete, ondblclick, onhide, onkeydown, onkeypress, onkeyup, onmousedow= n, onmousemove, onmouseout, onmouseover, onmouseup, onshow, rendered, showD= elay, showEvent, style, styleClass, value, verticalOffset, zorder</code>" + ENDTEXT=3D"</toolTip>" ICON=3D"%Icons%/JBoss RichFaces/toolTip" + NAME=3D"toolTip" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= toolTip>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:state= s></code> <code></rich:states></code>&l= t;br>Attributes: <code>binding, id, rendered</code= >" + ENDTEXT=3D"</states>" ICON=3D"" NAME=3D"states" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<states>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><rich:dataT= able></code> <code></rich:dataTable></c= ode> Attributes: <code>ajaxKeys, align, bgcolor= , binding, border, captionClass, captionStyle, cellpadding, cellspacing, co= lumnClasses, columns, columnsWidth, componentState, dir, first, footerClass= , frame, headerClass, id, lang, onRowClick, onRowDblClick, onRowMouseDown, = onRowMouseMove, onRowMouseOut, onRowMouseOver, onRowMouseUp, onclick, ondbl= click, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout= , onmouseover, onmouseup, reRender, rendered, rowClasses, rowKeyConverter, = rowKeyVar, rows, rules, sortMode, sortPriority, stateVar, style, styleClass= , title, value, var, width</code>" + ENDTEXT=3D"</dataTable>" ICON=3D"%Icons%/JBoss RichFaces/dataTable" + NAME=3D"dataTable" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"&l= t;dataTable>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:panel= BarItem></code> <code></rich:panelBarItem>= </code> Attributes: <code>binding, contentCl= ass, contentStyle, headerClass, headerClassActive, headerStyle, headerStyle= Active, id, label, name, onenter, onleave, rendered</code>" + ENDTEXT=3D"</panelBarItem>" ICON=3D"%Icons%/JBoss RichFaces/panelB= arItem" + NAME=3D"panelBarItem" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D= "<panelBarItem>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:colum= nGroup></code> <code></rich:columnGroup>&l= t;/code> Attributes: <code>binding, columnClass= es, dir, filterMethod, filterValue, id, lang, rendered, rowClasses, selfSor= ted, sortOrder, style, styleClass, title</code>" + ENDTEXT=3D"</columnGroup>" ICON=3D"%Icons%/JBoss RichFaces/columnG= roup" + NAME=3D"columnGroup" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"= <columnGroup>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:treeN= odesAdaptor></code> <code></rich:treeNodesAdaptor= ></code> Attributes: <code>binding, i= d, includedNode, nodes, rendered, var</code>" + ENDTEXT=3D"</treeNodesAdaptor>" ICON=3D"%Icons%/JBoss RichFaces/tr= eeNodesAdaptor" + NAME=3D"treeNodesAdaptor" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<treeNodesAdaptor>" large-icon=3D"" model-entity=3D"S= harableMacroHTML" /> + Syntax: <code><rich:treeN= ode></code> <code></rich:treeNode></cod= e> Attributes: <code>acceptCursors, acceptedTyp= es, ajaxSingle, ajaxSubmitSelection, binding, bypassUpdates, changeExpandLi= stener, cursorTypeMapping, data, dragIndicator, dragListener, dragType, dra= gValue, dropListener, dropValue, eventsQueue, focus, grabCursors, grabbingC= ursors, highlightedClass, icon, iconCollapsed, iconExpanded, iconLeaf, id, = ignoreDupResponses, limitToList, nodeClass, nodeSelectListener, onbeforedom= update, onclick, oncollapse, oncomplete, oncontextmenu, ondblclick, ondrage= nd, ondragenter, ondragexit, ondragstart, ondrop, ondropend, ondropout, ond= ropover, onexpand, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove= , onmouseout, onmouseover, onmouseup, onselected, process, reRender, reject= Cursors, rendered, requestDelay, selectedClass, status, timeout, type, type= Mapping</code! >" + ENDTEXT=3D"</treeNode>" ICON=3D"%Icons%/JBoss RichFaces/treeNode" + NAME=3D"treeNode" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;treeNode>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:toggl= ePanel></code> <code></rich:togglePanel>&l= t;/code> Attributes: <code>binding, converter, = converterMessage, id, immediate, initialState, label, onclick, ondblclick, = onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmou= seover, onmouseup, rendered, required, requiredMessage, stateOrder, style, = styleClass, switchType, validator, validatorMessage, value, valueChangeList= ener</code>" + ENDTEXT=3D"</togglePanel>" ICON=3D"%Icons%/JBoss RichFaces/toggleP= anel" + NAME=3D"togglePanel" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"= <togglePanel>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:panel= MenuGroup></code> <code></rich:panelMenuGroup&= ;gt;</code> Attributes: <code>accesskey, act= ion, actionListener, ajaxSingle, align, alt, binding, bypassUpdates, conver= ter, converterMessage, data, disabled, disabledClass, disabledStyle, events= Queue, expandMode, expanded, focus, hoverClass, hoverStyle, iconClass, icon= Collapsed, iconDisabled, iconExpanded, iconStyle, id, ignoreDupResponses, i= mmediate, label, limitToList, maxlength, name, onbeforedomupdate, onblur, o= nchange, onclick, oncollapse, oncomplete, ondblclick, onexpand, onfocus, on= keydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouse= over, onmouseup, onselect, process, reRender, rendered, requestDelay, requi= red, requiredMessage, size, status, style, styleClass, tabindex, target, ti= meout, validator, validatorMessage, value, valueChangeListener</code>" + ENDTEXT=3D"</panelMenuGroup>" ICON=3D"%Icons%/JBoss RichFaces/pane= lMenuGroup" + NAME=3D"panelMenuGroup" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT= =3D"<panelMenuGroup>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:simpl= eTogglePanel></code> <code></rich:simpleTogglePan= el></code> Attributes: <code>action, = actionListener, ajaxSingle, binding, bodyClass, bypassUpdates, data, events= Queue, focus, headerClass, height, id, ignoreDupResponses, immediate, label= , limitToList, onbeforedomupdate, onclick, oncollapse, oncomplete, ondblcli= ck, onexpand, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onm= ouseout, onmouseover, onmouseup, opened, openedSet, process, reRender, rend= ered, requestDelay, status, style, styleClass, switchType, timeout, value, = width</code>" + ENDTEXT=3D"</simpleTogglePanel>" ICON=3D"%Icons%/JBoss RichFaces/s= impleTogglePanel" + NAME=3D"simpleTogglePanel" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<simpleTogglePanel>" large-icon=3D"" model-entity=3D"= SharableMacroHTML" /> + Syntax: <code><rich:dataF= ilterSlider></code> <code></rich:dataFilterSlider= ></code> Attributes: <code>action, ac= tionListener, ajaxSingle, binding, bypassUpdates, clientErrorMessage, data,= endRange, eventsQueue, fieldStyleClass, filterBy, focus, for, forValRef, h= andleStyleClass, handleValue, id, ignoreDupResponses, immediate, increment,= limitToList, manualInput, onSlideSubmit, onbeforedomupdate, onchange, oncl= ick, oncomplete, ondblclick, onerror, oninputkeydown, oninputkeypress, onin= putkeyup, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouse= out, onmouseover, onmouseup, onslide, process, rangeStyleClass, reRender, r= endered, requestDelay, sliderListener, startRange, status, storeResults, st= yle, styleClass, submitOnSlide, timeout, trackStyleClass, trailer, trailerS= tyleClass, value, width</code>" + ENDTEXT=3D"</dataFilterSlider>" ICON=3D"%Icons%/JBoss RichFaces/da= taFilterSlider" + NAME=3D"dataFilterSlider" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<dataFilterSlider>" large-icon=3D"" model-entity=3D"S= harableMacroHTML" /> + Syntax: <code><rich:progr= essBar></code> <code></rich:progressBar>&l= t;/code> Attributes: <code>actionListener, ajax= Single, binding, bypassUpdates, completeClass, data, enabled, eventsQueue, = finishClass, focus, id, ignoreDupResponses, immediate, initialClass, interv= al, label, limitToList, maxValue, minValue, mode, onbeforedomupdate, onclic= k, oncomplete, ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onm= ousemove, onmouseout, onmouseover, onmouseup, onsubmit, parameters, process= , progressVar, reRender, reRenderAfterComplete, remainClass, rendered, stat= us, style, styleClass, timeout, title, value</code>" + ENDTEXT=3D"</progressBar>" ICON=3D"%Icons%/JBoss RichFaces/progres= sBar" + NAME=3D"progressBar" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"= <progressBar>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:listS= huttle></code> <code></rich:listShuttle>&l= t;/code> Attributes: <code>activeItem, ajaxKeys= , binding, bottomControlClass, bottomControlLabel, columnClasses, component= State, controlsType, controlsVerticalAlign, converter, copyAllControlClass,= copyAllControlLabel, copyControlClass, copyControlLabel, disabledControlCl= ass, downControlClass, downControlLabel, fastMoveControlsVisible, fastOrder= ControlsVisible, first, id, immediate, listClass, listsHeight, moveControls= Visible, onblur, onbottomclick, onclick, oncopyallclick, oncopyclick, ondbl= click, ondownclick, onfocus, onlistchanged, onmousemove, onmouseout, onmous= eover, onorderchanged, onremoveallclick, onremoveclick, ontopclick, onupcli= ck, orderControlsVisible, removeAllControlClass, removeAllControlLabel, rem= oveControlClass, removeControlLabel, rendered, required, rowClasses, rowKey= Converter, rowKe! yVar, rows, showButtonLabels, sourceCaptionLabel, sourceListWidth, sourceR= equired, sourceSelection, sourceValue, style, styleClass, switchByClick, ta= rgetCaptionLabel, targetListWidth, targetRequired, targetSelection, targetV= alue, topControlClass, topControlLabel, upControlClass, upControlLabel, val= idator, valueChangeListener, var</code>" + ENDTEXT=3D"</listShuttle>" ICON=3D"%Icons%/JBoss RichFaces/listShu= ttle" + NAME=3D"listShuttle" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"= <listShuttle>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:tab&a= mp;gt;</code> <code></rich:tab></code> &= lt;b>Attributes: <code>action, actionListener, ajaxSingle, = binding, bypassUpdates, data, disabled, eventsQueue, focus, id, ignoreDupRe= sponses, immediate, label, labelWidth, limitToList, name, onbeforedomupdate= , onclick, oncomplete, ondblclick, onkeydown, onkeypress, onkeyup, onlabelc= lick, onlabeldblclick, onlabelkeydown, onlabelkeypress, onlabelkeyup, onlab= elmousedown, onlabelmousemove, onlabelmouseup, onmousedown, onmousemove, on= mouseout, onmouseover, onmouseup, ontabenter, ontableave, process, reRender= , rendered, requestDelay, status, style, styleClass, switchType, timeout, t= itle</code>" + ENDTEXT=3D"</tab>" ICON=3D"%Icons%/JBoss RichFaces/tab" NAME=3D"ta= b" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<tab>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:pickL= ist></code> <code></rich:pickList></cod= e> Attributes: <code>binding, controlClass, con= verter, converterMessage, copyAllControlLabel, copyControlLabel, disabled, = disabledStyle, disabledStyleClass, enabledStyle, enabledStyleClass, id, imm= ediate, listClass, listsHeight, moveControlsVerticalAlign, onblur, onclick,= ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onlistchanged, onmous= edown, onmousemove, onmouseout, onmouseover, onmouseup, removeAllControlLab= el, removeControlLabel, rendered, required, requiredMessage, showButtonsLab= el, sourceListWidth, style, styleClass, switchByClick, targetListWidth, tit= le, validator, validatorMessage, value, valueChangeListener</code>" + ENDTEXT=3D"</pickList>" ICON=3D"%Icons%/JBoss RichFaces/pickList" + NAME=3D"pickList" REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<= ;pickList>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:exten= dedDataTable></code> <code></rich:extendedDataTab= le></code> Attributes: <code>activeCl= ass, activeRowKey, ajaxKeys, align, bgcolor, binding, border, captionClass,= captionStyle, cellpadding, cellspacing, columnClasses, componentState, dir= , first, footerClass, frame, groupingColumn, headerClass, height, id, lang,= onRowClick, onRowDblClick, onRowMouseDown, onRowMouseMove, onRowMouseOut, = onRowMouseOver, onRowMouseUp, onclick, ondblclick, onkeydown, onkeypress, o= nkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, onsel= ectionchange, rendered, rowClasses, rowKeyConverter, rowKeyVar, rows, rules= , selectedClass, selection, selectionMode, sortMode, sortPriority, stateVar= , style, styleClass, tableState, title, value, var, width</code>" + ENDTEXT=3D"</extendedDataTable>" ICON=3D"%Icons%/JBoss RichFaces/d= ataTable" + NAME=3D"extendedDataTable" REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<extendedDataTable>" large-icon=3D"" model-entity=3D"= SharableMacroHTML" /> + Syntax: <code><rich:space= r></code> <code></rich:spacer></code>&l= t;br>Attributes: <code>binding, height, id, onclick, = ondblclick, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmou= seout, onmouseover, onmouseup, rendered, style, styleClass, title, width<= ;/code>" + ENDTEXT=3D"</spacer>" ICON=3D"%Icons%/JBoss RichFaces/spacer" NAME= =3D"spacer" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<spacer>" large-ic= on=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:panel= ></code> <code></rich:panel></code><= br>Attributes: <code>binding, bodyClass, header, head= erClass, id, onclick, ondblclick, onkeydown, onkeypress, onkeyup, onmousedo= wn, onmousemove, onmouseout, onmouseover, onmouseup, rendered, style, style= Class</code>" + ENDTEXT=3D"</panel>" ICON=3D"%Icons%/JBoss RichFaces/panel" NAME= =3D"panel" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<panel>" large-ico= n=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><rich:e= ditor></code> <code></rich:editor></cod= e> Attributes: <code>autoResize, binding, confi= guration, converter, converterMessage, customPlugins, dialogType, height, i= d, immediate, label, language, onchange, oninit, onsave, onsetup, plugins, = readonly, rendered, required, requiredMessage, skin, style, styleClass, tab= index, theme, useSeamText, validator, validatorMessage, value, valueChangeL= istener, viewMode, width</code>" + ENDTEXT=3D"</editor>" ICON=3D"%Icons%/JBoss RichFaces/editor" = NAME=3D"editor" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<editor>" large-icon=3D"" model= -entity=3D"SharableMacroHTML"/> + + + Syntax: <code><s:convertE= num /></code> Attributes: <code></= code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"convertEnum" REFORMAT=3D"no" SCOPE=3D"= project" + STARTTEXT=3D"<convertEnum/>" large-icon=3D"" model-entity=3D"Shara= bleMacroHTML" /> + Syntax: <code><s:validate= All></code> <code></s:validateAll></cod= e> Attributes: <code></code>" + ENDTEXT=3D"</validateAll>" ICON=3D"" NAME=3D"validateAll" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<validateAll>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:decorate= ></code> <code></s:decorate></code><= br>Attributes: <code>for</code>" + ENDTEXT=3D"</decorate>" ICON=3D"" NAME=3D"decorate" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<decorate>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:message&= amp;gt;</code> <code></s:message></code><br= >Attributes: <code>id, rendered, binding, showSummary= , showDetail, dir, lang, style, title, styleClass, onclick, ondblclick, onm= ousedown, onmouseup, onmouseover, onmousemove, onmouseout, onkeypress, onke= ydown, onkeyup, infoClass, infoStyle, warnClass, warnStyle, errorClass, err= orStyle, fatalClass, fatalStyle, tooltip</code>" + ENDTEXT=3D"</message>" ICON=3D"" NAME=3D"message" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<message>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:link&= ;gt;</code> <code></s:link></code> <b= >Attributes: <code>value, action, view, fragment, taskInsta= nce, disabled, propagation, pageflow, id, rendered, binding, dir, lang, sty= le, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onmouse= over, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, accesskey, c= harset, coords, hreflang, rel, rev, shape, tabindex, type, onblur, onfocus,= target</code>" + ENDTEXT=3D"</link>" ICON=3D"" NAME=3D"link" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<link>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><s:button&a= mp;gt;</code> <code></s:button></code> &= lt;b>Attributes: <code>value, action, view, fragment, taskI= nstance, disabled, propagation, pageflow, id, rendered, binding, dir, lang,= style, title, styleClass, onclick, ondblclick, onmousedown, onmouseup, onm= ouseover, onmousemove, onmouseout, onkeypress, onkeydown, onkeyup, accesske= y, alt, onblur, onfocus, onselect, onchange, tabindex, type, size, image<= ;/code>" + ENDTEXT=3D"</button>" ICON=3D"" NAME=3D"button" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<button>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><s:cache&am= p;gt;</code> <code></s:cache></code> <= ;b>Attributes: <code>key, region,= enabled</code>" + ENDTEXT=3D"</cache>" ICON=3D"" NAME=3D"cache" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<cache key=3D"|" region=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:convertD= ateTime /></code> Attributes: <code>d= ateStyle, locale, pattern, timeStyle, timeZone, type</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"convertDateTime" REFORMAT=3D"no" SCOPE= =3D"project" + STARTTEXT=3D"<convertDateTime/>" large-icon=3D"" model-entity=3D"S= harableMacroHTML" /> + Syntax: <code><s:div&= gt;</code> <code></s:div></code> A= ttributes: <code>style, styleClass, id, rendered, binding&l= t;/code>" + ENDTEXT=3D"</div>" ICON=3D"" NAME=3D"div" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<div>" large-icon=3D"" model-entity=3D"SharableMacroH= TML" /> + Syntax: <code><s:fragment= ></code> <code></s:fragment></code><= br>Attributes: <code>rendered</code>" + ENDTEXT=3D"</fragment>" ICON=3D"" NAME=3D"fragment" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<fragment>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:validate= /></code> Attributes: <code></cod= e>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"validate" REFORMAT=3D"no" SCOPE=3D"pro= ject" + STARTTEXT=3D"<validate/>" large-icon=3D"" model-entity=3D"Sharable= MacroHTML" /> + Syntax: <code><s:enumItem= /></code> Attributes: <code>en= umValue, label</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"enumItem" REFORMAT=3D"no" SCOPE=3D"pro= ject" + STARTTEXT=3D"<enumItem enumValue=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:selectDa= te></code> <code></s:selectDate></code>= Attributes: <code>for</code>" + ENDTEXT=3D"</selectDate>" ICON=3D"" NAME=3D"selectDate" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<selectDate for=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:selectIt= ems></code> <code></s:selectItems></cod= e> Attributes: <code>value, var, label, hideNoS= election, noSelectionLabel, cache, cacheKey, config</code>" + ENDTEXT=3D"</selectItems>" ICON=3D"" NAME=3D"selectItems" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<selectItems>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><%@ taglib = uri=3D"http://jboss.com/products/seam/taglib" prefix=3D"s&qu= ot; %></code>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"JBoss Seam= taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://jboss.com/products/seam= /taglib" prefix=3D"s" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:span&= ;gt;</code> <code></s:span></code> <b= >Attributes: <code>style, styleClass, id, rendered, binding= </code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"span" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><s:fileUplo= ad /></code> Attributes: <code>= data, fileName, fileSize, contentType, accept</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"fileUpload" REFORMAT=3D"no" SCOPE=3D"p= roject" + STARTTEXT=3D"<fileUpload data=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:graphicI= mage></code> <code></s:graphicImage></c= ode> Attributes: <code>alt, binding, converter,= dir, fileName, height, id, ismap, lang, longdesc, onclick, ondblclick, onk= eydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseo= ver, onmouseup, rendered, style, styleClass, title, url, usemap, value, wid= th</code>" + ENDTEXT=3D"</graphicImage>" ICON=3D"" NAME=3D"graphicImage" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<graphicImage>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:convertE= ntity></code> <code></s:convertEntity><= /code> Attributes: <code></code>" + ENDTEXT=3D"</convertEntity>" ICON=3D"" NAME=3D"convertEntity" REFO= RMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<convertEntity>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:taskId&a= mp;gt;</code> <code></s:taskId></code> &= lt;b>Attributes: <code>binding, id, name, rendered, value&l= t;/code>" + ENDTEXT=3D"</taskId>" ICON=3D"" NAME=3D"taskId" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<taskId>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><s:conversa= tionName></code> <code></s:conversationName&g= t;</code> Attributes: <code>binding, id, nam= e, value</code>" + ENDTEXT=3D"</conversationName>" ICON=3D"" NAME=3D"conversationName" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<conversationName>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:conversa= tionId></code> <code></s:conversationId>&l= t;/code> Attributes: <code>binding, id, name, r= endered, value</code>" + ENDTEXT=3D"</conversationId>" ICON=3D"" NAME=3D"conversationId" RE= FORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<conversationId>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:selectio= n></code> <code></s:selection></code>&l= t;br>Attributes: <code>binding, dataModel, id, name, = rendered, value, var</code>" + ENDTEXT=3D"</selection>" ICON=3D"" NAME=3D"selection" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<selection>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:transfor= mImageType></code> <code></s:transformImageType&a= mp;gt;</code> Attributes: <code>binding, con= tentType, id, rendered</code>" + ENDTEXT=3D"</transformImageType>" ICON=3D"" NAME=3D"transformImage= Type" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<transformImageTyp= e>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:remote&a= mp;gt;</code> <code></s:remote></code> &= lt;b>Attributes: <code>binding, id, include, rendered, styl= e, styleClass</code>" + ENDTEXT=3D"</remote>" ICON=3D"" NAME=3D"remote" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<remote>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><s:defaultA= ction></code> <code></s:defaultAction><= /code> Attributes: <code>binding, converter, id= , rendered, value</code>" + ENDTEXT=3D"</defaultAction>" ICON=3D"" NAME=3D"defaultAction" REFO= RMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<defaultAction>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:validate= FormattedText></code> <code></s:validateFormatted= Text></code> Attributes: <code></c= ode>" + ENDTEXT=3D"</validateFormattedText>" ICON=3D"" NAME=3D"validateFor= mattedText" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<validateFormatted= Text>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:label&am= p;gt;</code> <code></s:label></code> <= ;b>Attributes: <code>accesskey, binding, converter, dir, es= cape, for, id, lang, onblur, onclick, ondblclick, onfocus, onkeydown, onkey= press, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, onmouseu= p, rendered, style, styleClass, tabindex, title, value</code>" + ENDTEXT=3D"</label>" ICON=3D"" NAME=3D"label" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<label>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><s:formatte= dText></code> <code></s:formattedText><= /code> Attributes: <code>binding, converter, id= , rendered, value</code>" + ENDTEXT=3D"</formattedText>" ICON=3D"" NAME=3D"formattedText" REFO= RMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<formattedText>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:transfor= mImageSize></code> <code></s:transformImageSize&a= mp;gt;</code> Attributes: <code>binding, fac= tor, height, id, maintainRatio, rendered, width</code>" + ENDTEXT=3D"</transformImageSize>" ICON=3D"" NAME=3D"transformImage= Size" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<transformImageSiz= e>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:conversa= tionPropagation></code> <code></s:conversationPro= pagation></code> Attributes: <code>bi= nding, id, name, pageflow, type, value</code>" + ENDTEXT=3D"</conversationPropagation>" ICON=3D"" NAME=3D"conversat= ionPropagation" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<conversationPropa= gation>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><s:transfor= mImageBlur></code> <code></s:transformImageBlur&a= mp;gt;</code> Attributes: <code>binding, id,= radius, rendered</code>" + ENDTEXT=3D"</transformImageBlur>" ICON=3D"" NAME=3D"transformImage= Blur" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<transformImageBlu= r>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + + \ No newline at end of file Property changes on: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/= meta/jboss-palette.xml ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7964371429500099518==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 11:09:46 2009 Content-Type: multipart/mixed; boundary="===============0369091697125447907==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17619 - in trunk/struts/plugins/org.jboss.tools.struts: resources/meta and 1 other directory. Date: Wed, 16 Sep 2009 11:09:46 -0400 Message-ID: <200909161509.n8GF9kI7018521@svn01.web.mwc.hst.phx2.redhat.com> --===============0369091697125447907== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-16 11:09:45 -0400 (Wed, 16 Sep 2009) New Revision: 17619 Added: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-option= s.xml trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-palett= e.xml Modified: trunk/struts/plugins/org.jboss.tools.struts/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4885 options and palette split to jsf struts and jboss Modified: trunk/struts/plugins/org.jboss.tools.struts/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-16 15:08= :38 UTC (rev 17618) +++ trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-16 15:09= :45 UTC (rev 17619) @@ -400,4 +400,15 @@ watcherContributor=3D"org.jboss.tools.struts.webprj.model.helpers.s= ync.SyncProjectContext" /> + + + + + + + + \ No newline at end of file Added: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-op= tions.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-optio= ns.xml (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-optio= ns.xml 2009-09-16 15:09:45 UTC (rev 17619) @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Property changes on: trunk/struts/plugins/org.jboss.tools.struts/resources/= meta/struts-options.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-pa= lette.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-palet= te.xml (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/meta/struts-palet= te.xml 2009-09-16 15:09:45 UTC (rev 17619) @@ -0,0 +1,649 @@ + + + + + + <table width=3D"440"> <tr= > <td> \n\tName:&= lt;/font> <code> tiles taglib</code> \nSyntax: <code> = <%@ taglib uri=3D"/WEB-INF/struts-tiles.tld&= quot; prefix=3D"tiles" %> </c= ode> </td> </tr> </table>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"Struts til= es taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-tiles.tld"= ; prefix=3D"tiles" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Add</code> \n Syntax: <code> <tiles:= add> </tiles:add></code>\n \n <= font color=3D"OLIVE">Atributes:\n <co= de> \n value,\n content,\n direct,\n type,\n beanName,= \n beanProperty,\n beanScope,\n role\n </code>\n </td>\= n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</add>" ICON=3D"%Icons%/jstl/add" NAME=3D"add" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<add>" large-icon=3D"" model-entity= =3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Import Attribute</code> \n <font= color=3D"OLIVE">Syntax: <code> &= amp;lt;tiles:importAttribute /></code>\n \n Atributes:\n <code><= ;br>\n name,\n scope,\n ignore\n </code>\n </td>\n <= ;/tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/jstl/import" NAME=3D"importAttribute" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<importAttribute/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Get</code> \n Syntax: <code> <tiles:= get /></code>\n \n = Atributes:\n <code> \n name</= b>,\n ignore,\n flush,\n role\n </code>\n </td>\n <= /tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/jstl/get" NAME=3D"get" REFORMAT=3D"no" S= COPE=3D"project" + STARTTEXT=3D"<get name=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Put</code> \n Syntax: <code> <tiles:= put> </tiles:put></code>\n \n <= font color=3D"OLIVE">Atributes:\n <co= de> \n name,\n value,\n content,\n direct,\n type,\n = beanName,\n beanProperty,\n beanScope,\n role\n </code>\n = </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</put>" ICON=3D"%Icons%/jstl/add" NAME=3D"put" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<put>" large-icon=3D"" model-entity= =3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Definition</code> \n Syntax: <code> &lt= ;tiles:definition> </tiles:definition></code>= \n \n Atributes:= \n <code> \n id,\n scope,\n temp= late,\n page,\n role,\n extends\n </code>\n </td>\n &l= t;/tr>\n </table>\n</html>\n" + ENDTEXT=3D"</definition>" ICON=3D"%Icons%/Struts Bean/define" NAME= =3D"definition" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<definition id=3D&= quot;|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Insert</code> \n Syntax: <code> <til= es:insert> </tiles:insert></code>\n = \n Atributes:\n= <code> \n template,\n component,\n page,\n definiti= on,\n attribute,\n name,\n beanName,\n beanProperty,\n beanS= cope,\n flush,\n ignore,\n role,\n controllerUrl,\n controll= erClass\n </code>\n </td>\n </tr>\n </table>\n</html>\= n" + ENDTEXT=3D"</insert>" ICON=3D"%Icons%/jstl/add" NAME=3D"insert" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<insert>" large-ic= on=3D"" + model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Use Attribute</code> \n Syntax: <code> &= ;lt;tiles:useAttribute /></code>\n \n Atributes:\n <code> = \n name,\n id,\n classname,\n scope,\n ignore\n= </code>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/jstl/attr" NAME=3D"useAttribute" REFORMA= T=3D"no" + SCOPE=3D"project" STARTTEXT=3D"<useAttribute name=3D"|"/= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Get As String</code> \n Syntax: <code> &= ;lt;tiles:getAsString /></code>\n \n Atributes:\n <code> \n = name,\n ignore,\n role\n </code>\n </td>\n= </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/jstl/getAsString" NAME=3D"getAsString" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<getAsString name= =3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Put List</code> \n Syntax: <code> &lt= ;tiles:putList> </tiles:putList></code>\n &= lt;br>\n Atributes:</f= ont>\n <code> \n name\n </code>\n </t= d>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</putList>" ICON=3D"%Icons%/jstl/putList" NAME=3D"putLi= st" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<putList name=3D&q= uot;|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Init Component Definitions</code> \n = Syntax: <cod= e> <tiles:initComponentDefinitions /></code>\n <= ;br>\n Atributes:</fon= t>\n <code> \n file,\n classname\n </co= de>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/jstl/initComponentDefinitions" NAME=3D"i= nitComponentDefinitions" + REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<initComponentDefinitions file=3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Javascript</code> \n Syntax: <code> &lt= ;HTML:javascript /></code>\n \n Atributes:\n <code> \n cd= ata,\n dynamicJavascript,\n formName,\n method,\n page,\n sr= c,\n staticJavascript,\n htmlComment\n </code>\n </td>\n = </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/javascript" NAME=3D"javascri= pt" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<javascript />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"300"> <tr= > <td> \n\tName:&= lt;/font> <code> Html</code> \nSyntax: <code> <HTML:ht= ml> </HTML:html></code> <fon= t color=3D"OLIVE">Atributes: <code>&= lt;br> locale, xhtml </code> </td> </tr> </ta= ble> </html>" + ENDTEXT=3D"</html>" ICON=3D"%Icons%/Struts HTML/html" NAME=3D"html" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<html>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + <table width=3D"420"> <tr= > <td> \n\tName:&= lt;/font> <code> html taglib</code> \nSyntax: <code> &= lt;nobr><%@ taglib uri=3D"/WEB-INF/struts-html.tld&quot= ; prefix=3D"html" %> </code> = </td> </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"Struts htm= l taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-html.tld"= prefix=3D"html" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Rewrite</code> \n Syntax: <code> <HT= ML:rewrite /></code>\n \n Atributes:\n <code> \n anchor,\= n forward,\n href,\n name,\n page,\n paramId,\n paramName= ,\n paramProperty,\n paramScope,\n property,\n scope,\n tran= saction\n </code>\n </td>\n </tr>\n </table>\n</html>\= n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/rewrite" NAME=3D"rewrite" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<rewrite />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Link</code> \n Syntax: <code> <HTML:= link> </HTML:link></code>\n \n <= ;font color=3D"OLIVE">Atributes:\n <c= ode> \n accesskey,\n action,\n anchor,\n forward,\n hr= ef,\n indexed,\n indexId,\n linkName,\n name,\n onblur,\n = onclick,\n ondblclick,\n onfocus,\n onkeydown,\n onkeypress,\n= onkeyup,\n onmousedown,\n onmousemove,\n onmouseout,\n onmo= useover,\n onmouseup,\n page,\n paramId,\n paramName,\n para= mProperty,\n paramScope,\n property,\n scope,\n style,\n sty= leClass,\n styleId,\n tabindex,\n target,\n title,\n titleKe= y,\n transaction\n ! </code>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</link>" ICON=3D"%Icons%/Struts HTML/link" NAME=3D"link" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<link>" large-icon= =3D"" + model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Options</code> \n Syntax: <code> <HT= ML:options> </HTML:options></code>\n <br= >\n Atributes:\= n <code> \n collection,\n filter,\n labelName,\n lab= elProperty,\n name,\n property,\n style,\n styleClass\n <= /code>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</options>" ICON=3D"%Icons%/Struts HTML/options" NAME= =3D"options" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<options>" large-ic= on=3D"" + model-entity=3D"SharableMacroHTML" /> + <table width=3D"300"> <tr= > <td> Name:</fon= t> <code> Base</code> Syntax: <code> <HTML:base /= ></code> A= tributes: <code> target, server &= lt;/code> </td> </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/base" NAME=3D"base" REFORMAT= =3D"no" + SCOPE=3D"project" STARTTEXT=3D"<base />" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> XHTML</code> \n Syntax: <code> <HTML= :xhtml> </HTML:xhtml></code>\n \n = Atributes:\n &l= t;code> \n </code>\n </td>\n </tr>\n </table>\n<= /html>\n" + ENDTEXT=3D"</html>" ICON=3D"%Icons%/Struts HTML/xhtml" NAME=3D"xht= ml" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<html xhtml=3D&quo= t;true">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Frame</code> \n Syntax: <code> <HTML= :frame> </HTML:frame></code>\n \n = Atributes:\n &l= t;code> \n action,\n anchor,\n forward,\n frameborder,\n = frameName,\n href,\n longdesc,\n marginheight,\n marginwidth= ,\n name,\n noresize,\n page,\n paramId,\n paramName,\n p= aramProperty,\n paramScope,\n property,\n scope,\n scrolling,\n= style,\n styleClass,\n styleId,\n title,\n titleKey,\n t= ransaction\n </code>\n </td>\n </tr>\n </table>\n</htm= l>\n" + ENDTEXT=3D"</frame>" ICON=3D"%Icons%/Struts HTML/frame" NAME=3D"fr= ame" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<frame>" large-ico= n=3D"" + model-entity=3D"SharableMacroHTML" /> + <table width=3D"300"> <tr= > <td> Name:</fon= t> <code> Errors</code> Syntax: <code> <HTML:erro= rs /></code> <= ;b>Atributes: <code> bundle, locale, = name, property </code> </td> </tr> </table> &= lt;/html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/errors" NAME=3D"errors" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<errors />" large-i= con=3D"" + model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n Syntax:</b= > <code> <HTML:img /></code>\n <br= >\n Atributes:\= n <code> \n align,\n alt,\n altKey,\n border,\n b= undle,\n height,\n hspace,\n imageName,\n ismap,\n locale,\n= lowsrc,\n name,\n onclick,\n ondblclick,\n onkeydown,\n = onkeypress,\n onkeyup,\n onmousedown,\n onmousemove,\n onmouseo= ut,\n onmouseover,\n onmouseup,\n paramId,\n page,\n pageKey= ,\n paramName,\n paramProperty,\n paramScope,\n property,\n = scope,\n src,\n srcKey,\n style,\n styleClass,\n styleId,\n = title,\n titleKey,\n usemap,\n vspace,\n width\n </cod= e>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/img" NAME=3D"img" REFORMAT= =3D"no" + SCOPE=3D"project" STARTTEXT=3D"<img page=3D"|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"300"> <tr= > <td> Name:<= ;/font> <code> Image</code> Syntax: <code> <HTML:imag= e src=3D"" /> </code> Atributes: <code> = accesskey, align, alt, altKey, border, bundle, = disabled, indexed, locale, onblur, onchange, onclick, = ondblclick, onfocus, onkeydown, onkeypress, onkeyup, = onmousedown, onmousemove, onmouseout, onmouseover, onmous= eup, page, pageKey, property, src, srcKey, style, = styleClass, styleId, tabindex, title, titleKey, valu= e </code> </td> </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/image" NAME=3D"image" REFORM= AT=3D"no" + SCOPE=3D"project" STARTTEXT=3D"<image src=3D"|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"300"> <tr= > <td> \n\tName:&= lt;/font> <code> Messages</code> \nSyntax: <code> <HTM= L:messages> </HTML:messages></code> <br= > Atributes: = <code> id, bundle, locale, name, = property, header, footer, message </code> </td>= </tr> </table> </html>" + ENDTEXT=3D"</messages>" ICON=3D"%Icons%/Struts HTML/messages" NAME= =3D"messages" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<messages id=3D&qu= ot;|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Options Collection</code> \n <fo= nt color=3D"OLIVE">Syntax: <code><br= ><HTML:optionsCollection> </HTML:optionsCollecti= on></code>\n \n <= ;b>Atributes:\n <code> \n filter,\n label= ,\n name,\n property,\n style,\n styleClass,\n value\n &l= t;/code>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</optionsCollection>" ICON=3D"%Icons%/Struts HTML/optio= ncollection" + NAME=3D"optionsCollection" REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<optionsCollection property=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Write</code> \n Syntax: <code> <bean= :write /></code>\n \n Atributes:\n <code> \n name&l= t;/b>,\n bundle,\n filter,\n format,\n formatKey,\n ignore,\= n locale,\n property,\n scope\n </code>\n </td>\n <= /tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/write" NAME=3D"write" REFORM= AT=3D"no" + SCOPE=3D"project" STARTTEXT=3D"<write name=3D"|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Define</code> \n Syntax: <code> <bea= n:define /> </code>\n \n Atributes:\n <code> \n <= ;b>id,\n name,\n property,\n scope,\n toScope,\n type= ,\n value\n </code>\n </td>\n </tr>\n </table>\n</h= tml>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/define" NAME=3D"define" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<define id=3D"= |" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Message</code> \n Syntax: <code> <be= an:message /></code>\n \n Atributes:\n <code> \n arg0,\n = arg1,\n arg2,\n arg3,\n arg4,\n bundle,\n key,\n local= e,\n name,\n property,\n scope\n </code>\n </td>\n <= ;/tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/message" NAME=3D"message" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<message />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Page</code> \n Syntax: <code> <bean:= page /></code>\n \n Atributes:\n <code> \n id</b= >,\n property\n </code>\n </td>\n </tr>\n &l= t;/table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/page" NAME=3D"page" REFORMAT= =3D"no" + SCOPE=3D"project" STARTTEXT=3D"<page id=3D"|" property= =3D"" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Header</code> \n Syntax: <code> <bea= n:header /></code>\n \n Atributes:\n <code> \n id&l= t;/b>,\n name,\n multiple,\n value\n </code>\n = </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/header" NAME=3D"header" + REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<header id=3D"|" name=3D"" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Include</code> \n Syntax: <code> <be= an:include /></code>\n \n Atributes:\n <code> \n id= ,\n anchor,\n forward,\n href,\n name,\n page,\n t= ransaction\n </code>\n </td>\n </tr>\n </table>\n</htm= l>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/include" NAME=3D"include" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<include id=3D"= ;|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Struts</code> \n Syntax: <code> <bea= n:struts /></code>\n \n Atributes:\n <code> \n id&l= t;/b>,\n formBean,\n forward,\n mapping\n </code>\n </t= d>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/struts" NAME=3D"struts" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<struts id=3D"= |" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Cookie</code> \n Syntax: <code> <bea= n:cookie /></code>\n \n Atributes:\n <code> \n id&l= t;/b>,\n name,\n multiple,\n value\n </code>\n = </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/cookie" NAME=3D"cookie" + REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<cookie id=3D"|" name=3D"" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Size</code> \n Syntax: <code> <bean:= size /></code>\n \n Atributes:\n <code> \n id</b= >,\n collection,\n name,\n property,\n scope\n </code>\n = </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/size" NAME=3D"size" REFORMAT= =3D"no" + SCOPE=3D"project" STARTTEXT=3D"<size id=3D"|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Resource</code> \n Syntax: <code> &lt= ;bean:resource /></code>\n \n Atributes:\n <code> \n <= b>id,\n name,\n input\n </code>\n </td= >\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/resource" NAME=3D"resource" + REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<resource id=3D"|" name=3D"" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Parameter</code> \n Syntax: <code> &lt= ;bean:parameter /></code>\n \n Atributes:\n <code> \n <= ;b>id,\n name,\n multiple,\n value\n </c= ode>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Bean/parameter" NAME=3D"parameter" + REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<parameter id=3D"|" name=3D"" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"420">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Bean Taglib</code> \n Syntax:\n <code> \= n <%@ taglib uri=3D"/WEB-INF/struts-bean.tld&am= p;quot; prefix=3D"bean" %> \n\t<= ;/code>\n </td>\n </tr>\n </table>\n</html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"Struts bea= n taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-bean.tld"= prefix=3D"bean" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Password Field</code> \n Syntax: <code> &am= p;lt;html:password property=3D"" /> </code>\n &= lt;br>\n Atributes:</f= ont>\n <code> \n property,\n accesskey,\n = alt,\n altKey,\n disabled,\n indexed,\n maxlength,\n name,\n= onblur,\n onchange,\n onclick,\n ondblclick,\n onfocus,\n = onkeydown,\n onkeypress,\n onkeyup,\n onmousedown,\n onmousem= ove,\n onmouseout,\n onmouseover,\n onmouseup,\n readonly,\n = redisplay,\n style,\n styleClass,\n styleId,\n size,\n tabi= ndex,\n title,\n titleKey,\n value\n </code>\n </td>\n = </tr>\n </table>\n&! lt;/html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/password" NAME=3D"password" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<password property= =3D"|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Form</code> \n Syntax: <code> <html:= form> </html:form></code>\n \n <= ;font color=3D"OLIVE">Atributes:\n <c= ode> \n action,\n enctype,\n focus,\n focusI= ndex,\n method,\n name,\n onreset,\n onsubmit,\n scope,\n = style,\n styleClass,\n styleId,\n target,\n type\n </cod= e>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</form>" ICON=3D"%Icons%/Struts HTML/form" NAME=3D"form" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<form action=3D&qu= ot;|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> File</code> \n Syntax: <code> <html:= file property=3D""/> </code>\n \n <= font color=3D"OLIVE">Atributes:\n <co= de> \n property,\n accesskey,\n accept,\n al= t,\n altKey,\n disabled,\n indexed,\n maxlength,\n name,\n = onblur,\n onchange,\n onclick,\n ondblclick,\n onfocus,\n = onkeydown,\n onkeypress,\n onkeyup,\n onmousedown,\n onmousemov= e,\n onmouseout,\n onmouseover,\n onmouseup,\n size,\n style= ,\n styleClass,\n styleId,\n tabindex,\n title,\n titleKey,\= n value\n </code>\n </td>\n </tr>\n </table>\n</htm= l>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/file" NAME=3D"file" REFORMAT= =3D"no" + SCOPE=3D"project" STARTTEXT=3D"<file property=3D"|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Multibox</code> \n Syntax: <code> &lt= ;html:multibox> </html:multibox></code>\n &= lt;br>\n Atributes:</f= ont>\n <code> \n property,\n accesskey,\n = alt,\n altKey,\n disabled,\n name,\n onblur,\n onchange,\n = onclick,\n ondblclick,\n onfocus,\n onkeydown,\n onkeypress,\= n onkeyup,\n onmousedown,\n onmousemove,\n onmouseout,\n onm= ouseover,\n onmouseup,\n style,\n styleClass,\n styleId,\n t= abindex,\n title,\n titleKey,\n value\n </code>\n </td>= \n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</multibox>" ICON=3D"%Icons%/Struts HTML/multibox" NAME= =3D"multibox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<multibox property= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"420"> <tr= > <td> \n\tName:&= lt;/font> <code> html taglib</code> \nSyntax: <code> &= lt;nobr><%@ taglib uri=3D"/WEB-INF/struts-html.tld&quot= ; prefix=3D"html" %> </code> = </td> </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"Struts htm= l taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-html.tld"= prefix=3D"html" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Reset Button</code> \n Syntax: <code> &= lt;html:reset> </html:reset></code>\n <b= r>\n Atributes:= \n <code> \n accesskey,\n alt,\n altKey,\n disabled,= \n onblur,\n onchange,\n onclick,\n ondblclick,\n onfocus,\n= onkeydown,\n onkeypress,\n onkeyup,\n onmousedown,\n onmous= emove,\n onmouseout,\n onmouseover,\n onmouseup,\n property,\n = style,\n styleClass,\n styleId,\n tabindex,\n title,\n ti= tleKey,\n value\n </code>\n </td>\n </tr>\n </table>\n= </html>\n" + ENDTEXT=3D"</reset>" ICON=3D"%Icons%/Struts HTML/reset" NAME=3D"re= set" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<reset>" large-ico= n=3D"" + model-entity=3D"SharableMacroHTML" /> + <table width=3D"300"> <tr= > <td> Name:</fon= t> <code> Button</code> Syntax: <code> <html:butt= on> </html:button></code> <f= ont color=3D"OLIVE">Atributes: <code= > property, accesskey, alt, altKey, = disabled, indexed, onblur, onchange, onclick, ondblcli= ck, onfocus, onkeydown, onkeypress, onkeyup, onmousedow= n, onmousemove, onmouseout, onmouseover, onmouseup, sty= le, styleClass, styleId, tabindex, title, titleKey, = value </code> </td> </tr> </table> </html>" + ENDTEXT=3D"</button>" ICON=3D"%Icons%/Struts HTML/button" NAME=3D"= button" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<button property= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Select</code> \n Syntax: <code> <htm= l:select> </html:select></code>\n \n= Atributes:\n = <code> \n property,\n alt,\n altKey,\n d= isabled,\n indexed,\n multiple,\n name,\n onblur,\n onchange= ,\n onclick,\n ondblclick,\n onfocus,\n onkeydown,\n onkeypr= ess,\n onkeyup,\n onmousedown,\n onmousemove,\n onmouseout,\n = onmouseover,\n onmouseup,\n style,\n styleClass,\n styleId,\n= tabindex,\n size,\n title,\n titleKey,\n value\n </co= de>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</select>" ICON=3D"%Icons%/Struts HTML/select" NAME=3D"= select" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<select property= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"300"> <tr= > <td> Name:</fon= t> <code> Checkbox</code> Syntax: <code> <html:ch= eckbox property=3D""> </html:checkbox>= </code> Atributes= : <code> property, acces= skey, alt, altKey, disabled, indexed, name, onblur,= onchange, onclick, ondblclick, onfocus, onkeydown, = onkeypress, onkeyup, onmousedown, onmousemove, onmouseout,= onmouseover, onmouseup, style, styleClass, styleId, = tabindex, title, titleKey, value </code> </td> = </tr> </table> </html>" + ENDTEXT=3D"</checkbox>" ICON=3D"%Icons%/Struts HTML/checkbox" NAME= =3D"checkbox" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<checkbox property= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Text</code> \n Syntax: <code> <html:= text property=3D"|" /> </code>\n \n &l= t;font color=3D"OLIVE">Atributes:\n <= code> \n property,\n accesskey,\n alt,\n alt= Key,\n disabled,\n indexed,\n maxlength,\n name,\n onblur,\n= onchange,\n onclick,\n ondblclick,\n onfocus,\n onkeydown,\= n onkeypress,\n onkeyup,\n onmousedown,\n onmousemove,\n onm= ouseout,\n onmouseover,\n onmouseup,\n readonly,\n size,\n s= tyle,\n styleClass,\n styleId,\n tabindex,\n title,\n titleK= ey,\n value\n </code>\n </td>\n </tr>\n </table>\n<= /html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/text" NAME=3D"text" REFORMAT= =3D"no" + SCOPE=3D"project" STARTTEXT=3D"<text property=3D"|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Submit</code> \n Syntax: <code> <htm= l:submit> </html:submit></code>\n \n= Atributes:\n = <code> \n accesskey,\n alt,\n altKey,\n disabled,\n = indexed,\n onblur,\n onchange,\n onclick,\n ondblclick,\n = onfocus,\n onkeydown,\n onkeypress,\n onkeyup,\n onmousedown,\n= onmousemove,\n onmouseout,\n onmouseover,\n onmouseup,\n pr= operty,\n style,\n styleClass,\n styleId,\n tabindex,\n titl= e,\n titleKey,\n value\n </code>\n </td>\n </tr>\n <= ;/table>\n</html>\n" + ENDTEXT=3D"</submit>" ICON=3D"%Icons%/Struts HTML/submit" NAME=3D"= submit" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<submit value=3D&q= uot;|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Hidden</code> \n Syntax: <code> <htm= l:hidden /></code>\n \n Atributes:\n <code> \n prop= erty,\n accesskey,\n alt,\n altKey,\n indexed,\n name= ,\n onblur,\n onchange,\n onclick,\n ondblclick,\n onfocus,\= n onkeydown,\n onkeypress,\n onkeyup,\n onmousedown,\n onmou= semove,\n onmouseout,\n onmouseover,\n onmouseup,\n style,\n = styleClass,\n styleId,\n title,\n titleKey,\n value,\n writ= e\n </code>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/hidden" NAME=3D"hidden" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<hidden property=3D= "|" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Option</code> \n Syntax: <code> <htm= l:option> </html:option></code>\n \n= Atributes:\n = <code> \n value,\n bundle,\n disabled,\n = key,\n locale,\n style,\n styleId,\n styleClass\n </code= >\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"</option>" ICON=3D"%Icons%/Struts HTML/option" NAME=3D"= option" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<option value=3D&q= uot;|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Radio</code> \n Syntax: <code> <html= :radio property=3D"" value=3D"" /> </co= de>\n \n Atributes:<= /b>\n <code> \n property,\n v= alue,\n accesskey,\n alt,\n altKey,\n disabled,\n ind= exed,\n name,\n onblur,\n onchange,\n onclick,\n ondblclick,= \n onfocus,\n onkeydown,\n onkeypress,\n onkeyup,\n onmoused= own,\n onmousemove,\n onmouseout,\n onmouseover,\n onmouseup,\n= style,\n styleClass,\n styleId,\n tabindex,\n title,\n t= itleKey,\n idName\n </code>\n </td>\n </tr>\n </table>= \n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/radio" NAME=3D"radio" REFORM= AT=3D"no" + SCOPE=3D"project" STARTTEXT=3D"<radio property=3D"|" val= ue=3D"" />" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Cancel Button</code> \n Syntax: <code> &= ;lt;html:cancel/> </code>\n \n Atributes:\n <code> \n = accesskey,\n alt,\n altKey,\n disabled,\n onblur,\n oncha= nge,\n onclick,\n ondblclick,\n onfocus,\n onkeydown,\n onke= ypress,\n onkeyup,\n onmousedown,\n onmousemove,\n onmouseout,\= n onmouseover,\n onmouseup,\n property,\n style,\n styleClas= s,\n styleId,\n tabindex,\n title,\n titleKey,\n value\n = </code>\n </td>\n </tr>\n </table>\n</html>\n" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts HTML/cancel" NAME=3D"cancel" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<cancel />" large-i= con=3D"" + model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"300">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Text Area</code> \n Syntax: <code> &lt= ;html:textarea> </html:textarea></code>\n &= lt;br>\n Atributes:</f= ont>\n <code> \n property,\n accesskey,\n = alt,\n altKey,\n cols,\n disabled,\n indexed,\n name,\n o= nblur,\n onchange,\n onclick,\n ondblclick,\n onfocus,\n onk= eydown,\n onkeypress,\n onkeyup,\n onmousedown,\n onmousemove,\= n onmouseout,\n onmouseover,\n onmouseup,\n readonly,\n rows= ,\n style,\n styleClass,\n styleId,\n tabindex,\n title,\n = titleKey,\n value\n </code>\n </td>\n </tr>\n </tabl= e>\n</html>\n" + ENDTEXT=3D"</textarea>" ICON=3D"%Icons%/Struts HTML/textarea" NAME= =3D"textarea" + REFORMAT=3D"no" SCOPE=3D"project" STARTTEXT=3D"<textarea property= =3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + Syntax: <code><logic:notM= atch></code> <code></logic:notMatch></c= ode> Attributes: <code>value, cook= ie, header, location, name, parameter, property, scope</code>" + ENDTEXT=3D"</notMatch>" ICON=3D"" NAME=3D"notMatch" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<notMatch value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:notP= resent></code> <code></logic:notPresent>&l= t;/code> Attributes: <code>cookie, header, name= , parameter, property, role, scope, user</code>" + ENDTEXT=3D"</notPresent>" ICON=3D"" NAME=3D"notPresent" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<notPresent>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:notE= qual></code> <code></logic:notEqual></c= ode> Attributes: <code>value, cook= ie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</notEqual>" ICON=3D"" NAME=3D"notEqual" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<notEqual value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:mess= agesPresent></code> <code></logic:messagesPresent= ></code> Attributes: <code>name, prop= erty, message</code>" + ENDTEXT=3D"</messagesPresent>" ICON=3D"" NAME=3D"messagesPresent" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<messagesPresent>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:iter= ate></code> <code></logic:iterate></cod= e> Attributes: <code>id, collectio= n, indexId, length, name, offset, property, scope, type</code>" + ENDTEXT=3D"</iterate>" ICON=3D"" NAME=3D"iterate" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<iterate id=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:less= Equal></code> <code></logic:lessEqual><= /code> Attributes: <code>value, co= okie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</lessEqual>" ICON=3D"" NAME=3D"lessEqual" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<lessEqual value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:equa= l></code> <code></logic:equal></code>&l= t;br>Attributes: <code>value, cookie, he= ader, name, parameter, property, scope</code>" + ENDTEXT=3D"</equal>" ICON=3D"" NAME=3D"equal" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<equal value=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:grea= terEqual></code> <code></logic:greaterEqual&g= t;</code> Attributes: <code>value</= b>, cookie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</greaterEqual>" ICON=3D"" NAME=3D"greaterEqual" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<greaterEqual value=3D"|"= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:matc= h></code> <code></logic:match></code>&l= t;br>Attributes: <code>value, cookie, he= ader, location, name, parameter, property, scope</code>" + ENDTEXT=3D"</match>" ICON=3D"" NAME=3D"match" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<match value=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:forw= ard /></code> Attributes: <code><b= >name</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"forward" REFORMAT=3D"no" SCOPE=3D"proj= ect" + STARTTEXT=3D"<forward name=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:grea= terThan></code> <code></logic:greaterThan>= </code> Attributes: <code>value= , cookie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</greaterThan>" ICON=3D"" NAME=3D"greaterThan" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<greaterThan value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:pres= ent></code> <code></logic:present></cod= e> Attributes: <code>cookie, header, name, para= meter, property, role, scope, user</code>" + ENDTEXT=3D"</present>" ICON=3D"" NAME=3D"present" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<present>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:mess= agesNotPresent></code> <code></logic:messagesNotP= resent></code> Attributes: <code>name= , property, message</code>" + ENDTEXT=3D"</messagesNotPresent>" ICON=3D"" NAME=3D"messagesNotPre= sent" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<messagesNotPresen= t>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:notE= mpty></code> <code></logic:notEmpty></c= ode> Attributes: <code>name, property, scope<= ;/code>" + ENDTEXT=3D"</notEmpty>" ICON=3D"" NAME=3D"notEmpty" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<notEmpty>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:less= Than></code> <code></logic:lessThan></c= ode> Attributes: <code>value, cook= ie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</lessThan>" ICON=3D"" NAME=3D"lessThan" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<lessThan value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"435"> <tr= > <td> Name:</fon= t> <code> logic taglib</code> Syntax: <code> <n= obr><%@ taglib uri=3D"/WEB-INF/struts-logic.tld" p= refix=3D"logic" %> </code> = </td> </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"Struts log= ic taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-logic.tld"= ; prefix=3D"logic" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:redi= rect></code> <code></logic:redirect></c= ode> Attributes: <code>action, anchor, forward,= href, name, page, paramId, paramName, paramProperty, paramScope, property,= scope, transaction, useLocalEncoding</code>" + ENDTEXT=3D"</redirect>" ICON=3D"" NAME=3D"redirect" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<redirect>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><logic:empt= y></code> <code></logic:empty></code>&l= t;br>Attributes: <code>name, property, scope</code= >" + ENDTEXT=3D"</empty>" ICON=3D"" NAME=3D"empty" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<empty>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + + + \n <table width=3D"330">\n <= tr>\n <td>\n\tName:<= ;/font> <code> c taglib</code> \n Syntax:\n <code> \n= <%@ taglib uri=3D"/WEB-INF/c.tld" pre= fix=3D"c" %> \n\t</code>\n &l= t;/td>\n </tr>\n </table>\n</html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"c taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/c.tld" prefix=3D= "c" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"330"> <tr= > <td> \n\tName:&= lt;/font> <code> x taglib</code> \nSyntax: <code> &l= t;nobr><%@ taglib uri=3D"/WEB-INF/x.tld" prefix=3D= "x" %> </code> </td> = </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"x taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/x.tld" prefix=3D= "x" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"420">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Bean Taglib</code> \n Syntax:\n <code> \= n <%@ taglib uri=3D"/WEB-INF/struts-bean.tld&am= p;quot; prefix=3D"bean" %> \n\t<= ;/code>\n </td>\n </tr>\n </table>\n</html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"bean tagli= b" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-bean.tld"= prefix=3D"bean" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"435"> <tr= > <td> Name:</fon= t> <code> logic taglib</code> Syntax: <code> <n= obr><%@ taglib uri=3D"/WEB-INF/struts-logic.tld" p= refix=3D"logic" %> </code> = </td> </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"logic tagl= ib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-logic.tld"= ; prefix=3D"logic" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"230">\n <= tr>\n <td>\n\tName:<= ;/font> <code> taglib</code> \n Syntax:\n <code> \n\t&l= t;nobr><%@ taglib uri=3D"|" prefix=3D"&am= p;quot; %> \n\t</code>\n </td>\n </tr>\n= </table>\n</html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"|" prefix=3D"" = %>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"420"> <tr= > <td> \n\tName:&= lt;/font> <code> html taglib</code> \nSyntax: <code> &= lt;nobr><%@ taglib uri=3D"/WEB-INF/struts-html.tld&quot= ; prefix=3D"html" %> </code> = </td> </tr> </table> </html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"html tagli= b" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-html.tld"= prefix=3D"html" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"360">\n <= tr>\n <td>\n\tName:<= ;/font> <code> sql taglib</code> \n Syntax:\n <code> \n= <%@ taglib uri=3D"/WEB-INF/sql.tld" p= refix=3D"sql" %> \n\t</code>\n = </td>\n </tr>\n </table>\n</html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"sql taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/sql.tld" prefix= =3D"sql" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + <table width=3D"440"> <tr= > <td> \n\tName:&= lt;/font> <code> files taglib</code> \nSyntax: <code> = <%@ taglib uri=3D"/WEB-INF/struts-tiles.tld&= quot; prefix=3D"tiles" %> </c= ode> </td> </tr> </table>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"tiles tagl= ib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/struts-tiles.tld"= ; prefix=3D"tiles" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"360">\n <= tr>\n <td>\n\tName:<= ;/font> <code> fmt taglib</code> \n Syntax:\n <code> \n= <%@ taglib uri=3D"/WEB-INF/fmt.tld" p= refix=3D"fmt" %> \n\t</code>\n = </td>\n </tr>\n </table>\n</html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"fmt taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"/WEB-INF/fmt.tld" prefix= =3D"fmt" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + Syntax: <code><nested:wri= te /></code> Attributes: <code>bundle= , filter, format, formatKey, ignore, locale, name, property, scope</code= >" + ENDTEXT=3D"" ICON=3D"" NAME=3D"write" REFORMAT=3D"no" SCOPE=3D"projec= t" + STARTTEXT=3D"<write/>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><nested:for= m></code> <code></nested:form></code>&l= t;br>Attributes: <code>action, enctype, = focus, method, onreset, onsubmit, style, styleClass, styleId, target</co= de>" + ENDTEXT=3D"</form>" ICON=3D"" NAME=3D"form" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<form action=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:mul= tibox></code> <code></nested:multibox><= /code> Attributes: <code>property,= accesskey, alt, altKey, disabled, name, onblur, onchange, onclick, ondblcl= ick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onm= ouseout, onmouseover, onmouseup, style, styleClass, styleId, tabindex, titl= e, titleKey, value</code>" + ENDTEXT=3D"</multibox>" ICON=3D"" NAME=3D"multibox" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<multibox property=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:mes= sage /></code> Attributes: <code>arg0= , arg1, arg2, arg3, arg4, bundle, key, locale, name, property, scope</co= de>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"message" REFORMAT=3D"no" SCOPE=3D"proj= ect" + STARTTEXT=3D"<message/>" large-icon=3D"" model-entity=3D"SharableM= acroHTML" /> + Syntax: <code><nested:fil= e></code> <code></nested:file></code>&l= t;br>Attributes: <code>property, accessk= ey, accept, alt, altKey, disabled, indexed, maxlength, name, onblur, onchan= ge, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedo= wn, onmousemove, onmouseout, onmouseover, onmouseup, size, style, styleClas= s, styleId, tabindex, title, titleKey, value</code>" + ENDTEXT=3D"</file>" ICON=3D"" NAME=3D"file" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<file property=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:ite= rate></code> <code></nested:iterate></c= ode> Attributes: <code>collection, id, indexId,= length, name, offset, property, scope, type</code>" + ENDTEXT=3D"</iterate>" ICON=3D"" NAME=3D"iterate" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<iterate>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:les= sEqual></code> <code></nested:lessEqual>&l= t;/code> Attributes: <code>value, = cookie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</lessEqual>" ICON=3D"" NAME=3D"lessEqual" REFORMAT=3D"= yes" + SCOPE=3D"project" STARTTEXT=3D"<lessEqual value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:gre= aterEqual></code> <code></nested:greaterEqual&= ;gt;</code> Attributes: <code>value<= ;/b>, cookie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</greaterEqual>" ICON=3D"" NAME=3D"greaterEqual" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<greaterEqual value=3D"|"= >" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:mat= ch></code> <code></nested:match></code>= Attributes: <code>value, cookie, = header, location, name, parameter, property, scope</code>" + ENDTEXT=3D"</match>" ICON=3D"" NAME=3D"match" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<match value=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:sub= mit></code> <code></nested:submit></cod= e> Attributes: <code>accesskey, alt, altKey, di= sabled, indexed, onblur, onchange, onclick, ondblclick, onfocus, onkeydown,= onkeypress, onkeyup, onmousedown, onmousemove, onmouseout, onmouseover, on= mouseup, property, style, styleClass, styleId, tabindex, title, titleKey, v= alue</code>" + ENDTEXT=3D"</submit>" ICON=3D"" NAME=3D"submit" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<submit>" large-icon=3D"" model-entity=3D"SharableMac= roHTML" /> + Syntax: <code><nested:hid= den></code> <code></nested:hidden></cod= e> Attributes: <code>property, alt= , altKey, indexed, name, title, titleKey, styleClass, styleId, value, write= </code>" + ENDTEXT=3D"</hidden>" ICON=3D"" NAME=3D"hidden" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<hidden property=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:img= /></code> Attributes: <code>accesske= y, align, alt, altKey, border, bundle, height, hspace, imageName, ismap, lo= cale, lowsrc, name, onkeydown, onkeypress, onkeyup, paramId, page, pageKey,= paramName, paramProperty, paramScope, property, scope, src, srcKey, style,= styleClass, styleId, title, titleKey, usemap, vspace, width</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"img" REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<img/>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><nested:wri= teNesting></code> <code></nested:writeNesting&= ;gt;</code> Attributes: <code>property, id, = filter</code>" + ENDTEXT=3D"</writeNesting>" ICON=3D"" NAME=3D"writeNesting" REFORM= AT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<writeNesting>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:les= sThan></code> <code></nested:lessThan><= /code> Attributes: <code>value, co= okie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</lessThan>" ICON=3D"" NAME=3D"lessThan" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<lessThan value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:ima= ge></code> <code></nested:image></code>= Attributes: <code>accesskey, align, alt, altKe= y, border, bundle, disabled, indexed, locale, onblur, onchange, onclick, on= dblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove= , onmouseout, onmouseover, onmouseup, page, pageKey, property, src, srcKey,= style, styleClass, tabindex, title, titleKey, value</code>" + ENDTEXT=3D"</image>" ICON=3D"" NAME=3D"image" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<image>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><nested:siz= e /></code> Attributes: <code>i= d, collection, name, property, scope</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"size" REFORMAT=3D"no" SCOPE=3D"project" + STARTTEXT=3D"<size id=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:emp= ty></code> <code></nested:empty></code>= Attributes: <code>name, property, scope</co= de>" + ENDTEXT=3D"</empty>" ICON=3D"" NAME=3D"empty" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<empty>" large-icon=3D"" model-entity=3D"SharableMacr= oHTML" /> + Syntax: <code><nested:tex= tarea></code> <code></nested:textarea><= /code> Attributes: <code>property,= accesskey, alt, altKey, cols, disabled, indexed, name, onblur, onchange, o= nclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, o= nmousemove, onmouseout, onmouseover, onmouseup, readonly, rows, style, styl= eClass, styleId, tabindex, title, titleKey, value</code>" + ENDTEXT=3D"</textarea>" ICON=3D"" NAME=3D"textarea" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<textarea property=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:pas= sword></code> <code></nested:password><= /code> Attributes: <code>property,= accesskey, alt, altKey, disabled, indexed, maxlength, name, onblur, onchan= ge, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedo= wn, onmousemove, onmouseout, onmouseover, onmouseup, readonly, redisplay, s= tyle, styleClass, styleId, size, tabindex, title, titleKey, value</code>" + ENDTEXT=3D"</password>" ICON=3D"" NAME=3D"password" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<password property=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:def= ine /></code> Attributes: <code><b= >id, name, property, scope, toScope, type, value</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"define" REFORMAT=3D"no" SCOPE=3D"proje= ct" + STARTTEXT=3D"<define id=3D"|"/>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:not= Match></code> <code></nested:notMatch><= /code> Attributes: <code>value, co= okie, header, location, name, parameter, property, scope</code>" + ENDTEXT=3D"</notMatch>" ICON=3D"" NAME=3D"notMatch" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<notMatch value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:not= Present></code> <code></nested:notPresent>= </code> Attributes: <code>cookie, header, na= me, parameter, property, role, scope, user</code>" + ENDTEXT=3D"</notPresent>" ICON=3D"" NAME=3D"notPresent" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<notPresent>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:not= Equal></code> <code></nested:notEqual><= /code> Attributes: <code>value, co= okie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</notEqual>" ICON=3D"" NAME=3D"notEqual" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<notEqual value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:mes= sagesPresent></code> <code></nested:messagesPrese= nt></code> Attributes: <code>name, pr= operty, message</code>" + ENDTEXT=3D"</messagesPresent>" ICON=3D"" NAME=3D"messagesPresent" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<messagesPresent>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:lin= k></code> <code></nested:link></code>&l= t;br>Attributes: <code>accesskey, action, anchor, for= ward, href, indexed, indexId, linkName, name, onblur, onclick, ondblclick, = onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmousemove, onmouseo= ut, onmouseover, onmouseup, page, paramId, paramName, paramProperty, paramS= cope, property, scope, style, styleClass, styleId, tabindex, target, title,= titleKey, transaction</code>" + ENDTEXT=3D"</link>" ICON=3D"" NAME=3D"link" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<link>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><nested:equ= al></code> <code></nested:equal></code>= Attributes: <code>value, cookie, = header, name, parameter, property, scope</code>" + ENDTEXT=3D"</equal>" ICON=3D"" NAME=3D"equal" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<equal value=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:sel= ect></code> <code></nested:select></cod= e> Attributes: <code>property, acc= esskey, alt, altKey, disabled, indexed, multiple, name, onblur, onchange, o= nclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, o= nmousemove, onmouseout, onmouseover, onmouseup, style, styleClass, styleId,= tabindex, size, title, titleKey, value</code>" + ENDTEXT=3D"</select>" ICON=3D"" NAME=3D"select" REFORMAT=3D"yes" S= COPE=3D"project" + STARTTEXT=3D"<select property=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:opt= ions /></code> Attributes: <code>coll= ection, filter, labelName, labelProperty, name, property, style, styleClass= </code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"options" REFORMAT=3D"no" SCOPE=3D"proj= ect" + STARTTEXT=3D"<options/>" large-icon=3D"" model-entity=3D"SharableM= acroHTML" /> + Syntax: <code><nested:che= ckbox></code> <code></nested:checkbox><= /code> Attributes: <code>property,= accesskey, alt, altKey, disabled, indexed, name, onblur, onchange, onclick= , ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmouse= move, onmouseout, onmouseover, onmouseup, style, styleClass, styleId, tabin= dex, title, titleKey, value</code>" + ENDTEXT=3D"</checkbox>" ICON=3D"" NAME=3D"checkbox" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<checkbox property=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:tex= t></code> <code></nested:text></code>&l= t;br>Attributes: <code>property, accessk= ey, alt, altKey, disabled, indexed, maxlength, name, onblur, onchange, oncl= ick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmousedown, onmo= usemove, onmouseout, onmouseover, onmouseup, readonly, size, style, styleCl= ass, styleId, tabindex, title, titleKey, value</code>" + ENDTEXT=3D"</text>" ICON=3D"" NAME=3D"text" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<text property=3D"|">" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:err= ors /></code> Attributes: <code>bundl= e, locale, name, property</code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"errors" REFORMAT=3D"no" SCOPE=3D"proje= ct" + STARTTEXT=3D"<errors/>" large-icon=3D"" model-entity=3D"SharableMa= croHTML" /> + Syntax: <code><nested:gre= aterThan></code> <code></nested:greaterThan&g= t;</code> Attributes: <code>value</= b>, cookie, header, name, parameter, property, scope</code>" + ENDTEXT=3D"</greaterThan>" ICON=3D"" NAME=3D"greaterThan" REFORMAT= =3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<greaterThan value=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:mes= sagesNotPresent></code> <code></nested:messagesNo= tPresent></code> Attributes: <code>na= me, property, message</code>" + ENDTEXT=3D"</messagesNotPresent>" ICON=3D"" NAME=3D"messagesNotPre= sent" + REFORMAT=3D"yes" SCOPE=3D"project" STARTTEXT=3D"<messagesNotPresen= t>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:not= Empty></code> <code></nested:notEmpty><= /code> Attributes: <code>name, property, scope&= lt;/code>" + ENDTEXT=3D"</notEmpty>" ICON=3D"" NAME=3D"notEmpty" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<notEmpty>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:pre= sent></code> <code></nested:present></c= ode> Attributes: <code>cookie, header, name, pa= rameter, property, role, scope, user</code>" + ENDTEXT=3D"</present>" ICON=3D"" NAME=3D"present" REFORMAT=3D"yes" + SCOPE=3D"project" STARTTEXT=3D"<present>" large-icon=3D"" + model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:rad= io></code> <code></nested:radio></code>= Attributes: <code>property, <b= >value, accesskey, alt, altKey, disabled, indexed, name, onblur, onc= hange, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onmous= edown, style, styleClass, styleId, tabindex, title, titleKey</code>" + ENDTEXT=3D"</radio>" ICON=3D"" NAME=3D"radio" REFORMAT=3D"yes" SCO= PE=3D"project" + STARTTEXT=3D"<radio property=3D"|" value=3D"">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + \n <table width=3D"420">\n <= tr>\n <td>\n\tName:<= ;/font> <code> Nested Taglib</code> \n Syntax:\n <code><br= >\n <%@ taglib uri=3D"uri=3D"http://jakart= a.apache.org/struts/tags-nested" prefix=3D"nested" %= > \n\t</code>\n </td>\n </tr>\n </tab= le>\n</html>" + ENDTEXT=3D"" ICON=3D"%Icons%/Struts Common/taglib" NAME=3D"Struts nes= ted taglib" + REFORMAT=3D"yes" SCOPE=3D"project" + STARTTEXT=3D"<%@ taglib uri=3D"http://jakarta.apache.org/stru= ts/tags-nested" prefix=3D"nested" %>\\n|" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:roo= t></code> <code></nested:root></code>&l= t;br>Attributes: <code>name</code>" + ENDTEXT=3D"</root>" ICON=3D"" NAME=3D"root" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<root>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><nested:nes= t></code> <code></nested:nest></code>&l= t;br>Attributes: <code>property</code>" + ENDTEXT=3D"</nest>" ICON=3D"" NAME=3D"nest" REFORMAT=3D"yes" SCOPE= =3D"project" + STARTTEXT=3D"<nest>" large-icon=3D"" model-entity=3D"SharableMacro= HTML" /> + Syntax: <code><nested:opt= ionsCollection /></code> Attributes: <= ;code>property, filter, label, name, style, styleClass, value&= lt;/code>" + ENDTEXT=3D"" ICON=3D"" NAME=3D"optionsCollection" REFORMAT=3D"no" SCO= PE=3D"project" + STARTTEXT=3D"<optionsCollection property=3D"|"/>" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + Syntax: <code><nested:mes= sages></code> <code></nested:messages><= /code> Attributes: <code>id, bundl= e, locale, name, property, header, footer, message</code>" + ENDTEXT=3D"</messages>" ICON=3D"" NAME=3D"messages" REFORMAT=3D"ye= s" + SCOPE=3D"project" STARTTEXT=3D"<messages id=3D"|">" + large-icon=3D"" model-entity=3D"SharableMacroHTML" /> + + + + \ No newline at end of file Property changes on: trunk/struts/plugins/org.jboss.tools.struts/resources/= meta/struts-palette.xml ___________________________________________________________________ Name: svn:mime-type + text/plain --===============0369091697125447907==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 11:22:18 2009 Content-Type: multipart/mixed; boundary="===============1835514109207430378==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17620 - trunk/jsf/docs/userguide/en/modules. Date: Wed, 16 Sep 2009 11:22:18 -0400 Message-ID: <200909161522.n8GFMIUs022169@svn01.web.mwc.hst.phx2.redhat.com> --===============1835514109207430378== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2009-09-16 11:22:17 -0400 (Wed, 16 Sep 2009) New Revision: 17620 Modified: trunk/jsf/docs/userguide/en/modules/editors.xml Log: https://jira.jboss.org/jira/browse/JBDS-860 CA for EL in Styles on Xhtml p= ages - 3.1.2. Content Assist is updated = Modified: trunk/jsf/docs/userguide/en/modules/editors.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en/modules/editors.xml 2009-09-16 15:09:45 UTC= (rev 17619) +++ trunk/jsf/docs/userguide/en/modules/editors.xml 2009-09-16 15:22:17 UTC= (rev 17620) @@ -238,7 +238,7 @@ Content Assist features while= developing: - Content Assist for XML, JSP and JSF configur= ation files + Content Assist for XML, XHTML, JSP and JSF = configuration files Content Assist based on project data --===============1835514109207430378==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 13:48:55 2009 Content-Type: multipart/mixed; boundary="===============3743143071098283589==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17621 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver. Date: Wed, 16 Sep 2009 13:48:55 -0400 Message-ID: <200909161748.n8GHmt9P020657@svn01.web.mwc.hst.phx2.redhat.com> --===============3743143071098283589== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-16 13:48:54 -0400 (Wed, 16 Sep 2009) New Revision: 17621 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolution.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolutionImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELResolution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolution.java 2009-09-16 15:22:17 UTC (rev 176= 20) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolution.java 2009-09-16 17:48:54 UTC (rev 176= 21) @@ -37,11 +37,11 @@ ELContext getContext(); = /** - * Finds the segment which is resolved to given java element. + * Finds the segments which are resolved to given java element. * @param element * @return */ - ELSegment findSegmentByJavaElement(IJavaElement element); + List findSegmentsByJavaElement(IJavaElement element); = /** * Finds the segment which is located at given offset. Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELResolutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java 2009-09-16 15:22:17 UTC (rev= 17620) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java 2009-09-16 17:48:54 UTC (rev= 17621) @@ -33,9 +33,9 @@ protected boolean mapOrCollectionOrBundleAmoungTheTokens; = /* (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentB= yJavaElement(org.eclipse.jdt.core.IJavaElement) + * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegments= ByJavaElement(org.eclipse.jdt.core.IJavaElement) */ - public ELSegment findSegmentByJavaElement(IJavaElement element) { + public List findSegmentsByJavaElement(IJavaElement element) { // TODO return null; } --===============3743143071098283589==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 14:01:26 2009 Content-Type: multipart/mixed; boundary="===============4582805794139509451==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17622 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver. Date: Wed, 16 Sep 2009 14:01:26 -0400 Message-ID: <200909161801.n8GI1QRp023364@svn01.web.mwc.hst.phx2.redhat.com> --===============4582805794139509451== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-16 14:01:25 -0400 (Wed, 16 Sep 2009) New Revision: 17622 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberELSegment.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/JavaMemberELSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java 2009-09-16 17:48:54 UTC (= rev 17621) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java 2009-09-16 18:01:25 UTC (= rev 17622) @@ -37,4 +37,4 @@ * @return true if an underlying object is field and this field has sette= r. */ boolean hasSetter(); -} \ No newline at end of file +} = \ No newline at end of file --===============4582805794139509451==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 14:37:01 2009 Content-Type: multipart/mixed; boundary="===============5128836884931124700==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17623 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver. Date: Wed, 16 Sep 2009 14:37:01 -0400 Message-ID: <200909161837.n8GIb1he029685@svn01.web.mwc.hst.phx2.redhat.com> --===============5128836884931124700== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-16 14:37:01 -0400 (Wed, 16 Sep 2009) New Revision: 17623 Removed: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberElSegment.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/= tools/common/el/core/resolver/JavaMemberElSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberElSegment.java 2009-09-16 18:01:25 UTC (= rev 17622) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberElSegment.java 2009-09-16 18:37:01 UTC (= rev 17623) @@ -1,40 +0,0 @@ -/*************************************************************************= ****** = - * 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.common.el.core.resolver; - -import org.eclipse.jdt.core.IJavaElement; - -/** - * Describes a segment of EL operand which is a Java Element. = - * @author Alexey Kazakov - */ -public interface JavaMemberElSegment extends ELSegment { - - /** - * @return member info object of resolved segment. May return null. - */ - TypeInfoCollector.MemberInfo getMemberInfo(); - - /** - * @return Java Element which represent this resolve segment. May return = null. = - */ - IJavaElement getJavaElement(); - - /** - * @return true if an underlying object is field and this field has gette= r. - */ - boolean hasGetter(); - - /** - * @return true if an underlying object is field and this field has sette= r. - */ - boolean hasSetter(); -} \ No newline at end of file --===============5128836884931124700==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 14:39:27 2009 Content-Type: multipart/mixed; boundary="===============4675311858778973631==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17624 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver. Date: Wed, 16 Sep 2009 14:39:27 -0400 Message-ID: <200909161839.n8GIdRjk029938@svn01.web.mwc.hst.phx2.redhat.com> --===============4675311858778973631== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-16 14:39:26 -0400 (Wed, 16 Sep 2009) New Revision: 17624 Removed: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberELSegment.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/= tools/common/el/core/resolver/JavaMemberELSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java 2009-09-16 18:37:01 UTC (= rev 17623) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java 2009-09-16 18:39:26 UTC (= rev 17624) @@ -1,40 +0,0 @@ -/*************************************************************************= ****** = - * 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.common.el.core.resolver; - -import org.eclipse.jdt.core.IJavaElement; - -/** - * Describes a segment of EL operand which is a Java Element. = - * @author Alexey Kazakov - */ -public interface JavaMemberELSegment extends ELSegment { - - /** - * @return member info object of resolved segment. May return null. - */ - TypeInfoCollector.MemberInfo getMemberInfo(); - - /** - * @return Java Element which represent this resolve segment. May return = null. = - */ - IJavaElement getJavaElement(); - - /** - * @return true if an underlying object is field and this field has gette= r. - */ - boolean hasGetter(); - - /** - * @return true if an underlying object is field and this field has sette= r. - */ - boolean hasSetter(); -} = \ No newline at end of file --===============4675311858778973631==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 14:48:12 2009 Content-Type: multipart/mixed; boundary="===============0904998739904265553==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17625 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver. Date: Wed, 16 Sep 2009 14:48:12 -0400 Message-ID: <200909161848.n8GImCeq031472@svn01.web.mwc.hst.phx2.redhat.com> --===============0904998739904265553== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-16 14:48:12 -0400 (Wed, 16 Sep 2009) New Revision: 17625 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberELSegment.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/to= ols/common/el/core/resolver/JavaMemberELSegment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java (= rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegment.java 2009-09-16 18:48:12 UTC (= rev 17625) @@ -0,0 +1,40 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +import org.eclipse.jdt.core.IJavaElement; + +/** + * Describes a segment of EL operand which is a Java Element. = + * @author Alexey Kazakov + */ +public interface JavaMemberELSegment extends ELSegment { + + /** + * @return member info object of resolved segment. May return null. + */ + TypeInfoCollector.MemberInfo getMemberInfo(); + + /** + * @return Java Element which represent this resolve segment. May return = null. = + */ + IJavaElement getJavaElement(); + + /** + * @return true if an underlying object is field and this field has gette= r. + */ + boolean hasGetter(); + + /** + * @return true if an underlying object is field and this field has sette= r. + */ + boolean hasSetter(); +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/sr= c/org/jboss/tools/common/el/core/resolver/JavaMemberELSegment.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============0904998739904265553==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 16:28:24 2009 Content-Type: multipart/mixed; boundary="===============6988863155051767911==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17626 - in trunk/as/plugins: org.jboss.ide.eclipse.as.wtp.ui and 2 other directories. Date: Wed, 16 Sep 2009 16:28:24 -0400 Message-ID: <200909162028.n8GKSOCn020436@svn01.web.mwc.hst.phx2.redhat.com> --===============6988863155051767911== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-16 16:28:24 -0400 (Wed, 16 Sep 2009) New Revision: 17626 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclip= se/as/wtp/ui/propertypage/OutputFolderReferenceWizardFragment.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 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 trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclip= se/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclip= se/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java Log: Adding output folder mappings Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java 2009-09-16 18:48:1= 2 UTC (rev 17625) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java 2009-09-16 20:28:2= 4 UTC (rev 17626) @@ -14,7 +14,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualReference; = public class OutputFolderReferenceResolver implements IReferenceResolver { - public static final String OUTPUT_FOLDER_SEGMENT =3D "org.jboss.ide.eclip= se.as.wtp.core.vcf.outputFolder"; + public static final String OUTPUT_FOLDER_SEGMENT =3D "org.jboss.ide.eclip= se.as.wtp.core.vcf.outputFolders"; public static final String OUTPUT_FOLDER_PROTOCOL =3D PlatformURLModuleCo= nnection.MODULE_PROTOCOL +IPath.SEPARATOR+ OUTPUT_FOLDER_SEGMENT + IPath.SEPARATOR; public OutputFolderReferenceResolver() { @@ -38,7 +38,11 @@ public IVirtualReference resolve(IVirtualComponent context, ReferencedComponent referencedComponent) { String project =3D referencedComponent.getHandle().segment(1); - IProject p =3D ResourcesPlugin.getWorkspace().getRoot().getProject(proje= ct); + IProject p =3D null; + if( !project.equals("")) = + p =3D ResourcesPlugin.getWorkspace().getRoot().getProject(project); + else + p =3D context.getProject(); IVirtualComponent comp =3D new OutputFoldersVirtualComponent(p, context); IVirtualReference ref =3D ComponentCore.createReference(context, comp); ref.setArchiveName(referencedComponent.getArchiveName()); @@ -49,11 +53,12 @@ = public ReferencedComponent resolve(IVirtualReference reference) { if( reference.getReferencedComponent() instanceof OutputFoldersVirtualCo= mponent ) { + OutputFoldersVirtualComponent comp =3D (OutputFoldersVirtualComponent)r= eference.getReferencedComponent(); IProject p =3D reference.getReferencedComponent().getProject(); ReferencedComponent rc =3D ComponentcorePackage.eINSTANCE.getComponentc= oreFactory().createReferencedComponent(); rc.setArchiveName(reference.getArchiveName()); rc.setRuntimePath(reference.getRuntimePath()); - rc.setHandle(URI.createURI(OUTPUT_FOLDER_PROTOCOL + p.getName())); + rc.setHandle(URI.createURI(comp.getId())); rc.setDependencyType(DependencyType.CONSUMES_LITERAL); return rc; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-16 18:48:1= 2 UTC (rev 17625) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-16 20:28:2= 4 UTC (rev 17626) @@ -1,5 +1,7 @@ package org.jboss.ide.eclipse.as.wtp.core.vcf; = +import java.util.ArrayList; +import java.util.List; import java.util.Properties; = import org.eclipse.core.resources.IContainer; @@ -8,6 +10,10 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; @@ -18,6 +24,7 @@ = private IProject project; private IVirtualComponent referencingComp; + = public OutputFoldersVirtualComponent(IProject p, IVirtualComponent refere= ncingComponent) { this.project =3D p; this.referencingComp =3D referencingComponent; @@ -45,7 +52,9 @@ } = protected String getId() { - return OutputFolderReferenceResolver.OUTPUT_FOLDER_SEGMENT + Path.SEPARA= TOR + project.getName(); + if( project.equals(referencingComp.getProject())) + return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; + return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL + Path.SEPAR= ATOR + project.getName(); } = public IProject getProject() { @@ -56,10 +65,45 @@ } = public IVirtualFolder getRootFolder() { - IContainer[] containers =3D J2EEProjectUtilities.getOutputContainers(pro= ject); + IContainer[] containers =3D getOutputContainers(project); return new LimitedContainerVirtualFolder(project, new Path("/"), contain= ers); } + = + private static IContainer[] getOutputContainers(IProject project) { + List result =3D new ArrayList(); + try { + if (!project.hasNature(JavaCore.NATURE_ID)) + return new IContainer[] {}; + } catch (Exception e) { + } + IPackageFragmentRoot[] sourceContainers =3D getSourceContainers(project); + for (int i =3D 0; i < sourceContainers.length; i++) { + IContainer outputFolder =3D J2EEProjectUtilities.getOutputContainer(pro= ject, sourceContainers[i]); + if (outputFolder !=3D null && !result.contains(outputFolder)) + result.add(outputFolder); + } + return result.toArray(new IContainer[result.size()]); + } = + public static IPackageFragmentRoot[] getSourceContainers(IProject project= ) { + IJavaProject jProject =3D JavaCore.create(project); + if (jProject =3D=3D null) + return new IPackageFragmentRoot[0]; + List list =3D new ArrayList(= ); + IPackageFragmentRoot[] roots; + try { + roots =3D jProject.getPackageFragmentRoots(); + for (int i =3D 0; i < roots.length; i++) { + if (roots[i].getKind() !=3D IPackageFragmentRoot.K_SOURCE) + continue; + list.add(roots[i]); + } + } catch( JavaModelException jme ) { + } + return list.toArray(new IPackageFragmentRoot[list.size()]); + } + = + = public Properties getMetaProperties() { // TODO Auto-generated method stub return null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFES= T.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2= 009-09-16 18:48:12 UTC (rev 17625) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2= 009-09-16 20:28:24 UTC (rev 17626) @@ -24,7 +24,8 @@ org.eclipse.wst.server.ui;bundle-version=3D"1.1.102", org.eclipse.wst.server.core;bundle-version=3D"1.1.101", org.eclipse.wst.common.emfworkbench.integration;bundle-version=3D"1.1.300= ", - org.eclipse.emf.ecore;bundle-version=3D"2.5.0" + org.eclipse.emf.ecore;bundle-version=3D"2.5.0", + org.jboss.ide.eclipse.as.wtp.core;bundle-version=3D"1.0.0" 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-09-16 = 18:48:12 UTC (rev 17625) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-09-16 = 20:28:24 UTC (rev 17626) @@ -55,5 +55,11 @@ id=3D"org.jboss.ide.eclipse.as.wtp.ui.variableReference" name=3D"Variable"> + + Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/id= e/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09= -16 18:48:12 UTC (rev 17625) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09= -16 20:28:24 UTC (rev 17626) @@ -453,7 +453,7 @@ Object p1 =3D wizard.getTaskModel().getObject(NewReferenceWizard.COMPON= ENT_PATH); IVirtualComponent[] compArr =3D c1 instanceof IVirtualComponent ? = new IVirtualComponent[] { (IVirtualComponent)c1 } : = - (IVirtualComponent[])c1; + (IVirtualComponent[])c1; = String[] pathArr =3D p1 instanceof String ? = new String[] { (String)p1 } : = (String[])p1; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/id= e/eclipse/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java 2009-09-= 16 18:48:12 UTC (rev 17625) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/ComponentDependencyContentProvider.java 2009-09-= 16 20:28:24 UTC (rev 17626) @@ -90,7 +90,7 @@ p =3D new Path(((VirtualArchiveComponent)comp).getUnderlyingDiskFile= ().getAbsolutePath()); return p.toString(); } - return comp.getProject().getName(); + return comp.getName(); } } else if (element instanceof IProject){ if (columnIndex =3D=3D 0) { Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/e= clipse/as/wtp/ui/propertypage/OutputFolderReferenceWizardFragment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/OutputFolderReferenceWizardFragment.java = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/OutputFolderReferenceWizardFragment.java 2009-09= -16 20:28:24 UTC (rev 17626) @@ -0,0 +1,109 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.SharedImages; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; +import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFoldersVirtualComponent; + +public class OutputFolderReferenceWizardFragment extends WizardFragment { + + protected TreeViewer viewer; + protected IPath[] paths; + protected IWizardHandle handle; + protected IProject selected =3D null; + public OutputFolderReferenceWizardFragment() { + super(); + } + + public boolean hasComposite() { + return true; + } + = + public Composite createComposite(Composite parent, IWizardHandle handle) { + this.handle =3D handle; + handle.setTitle("Add output folders"); + handle.setDescription("This reference will add in all source folder outp= uts from the selected project."); + + Composite c =3D new Composite(parent, SWT.NONE); + c.setLayout(new FormLayout()); + viewer =3D new TreeViewer(c, SWT.SINGLE | SWT.BORDER); + viewer.setContentProvider(getContentProvider()); + viewer.setLabelProvider(getLabelProvider()); + viewer.setInput(ResourcesPlugin.getWorkspace()); + + FormData fd =3D new FormData(); + fd.left =3D new FormAttachment(0, 5); + fd.top =3D new FormAttachment(0, 5); + fd.right =3D new FormAttachment(100, -5); + fd.bottom =3D new FormAttachment(100, -5); + viewer.getTree().setLayoutData(fd); + viewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + IVirtualComponent parentComp =3D (IVirtualComponent)getTaskModel().get= Object(NewReferenceWizard.ROOT_COMPONENT); + IStructuredSelection sel =3D (IStructuredSelection)viewer.getSelection= (); + selected =3D (IProject)sel.getFirstElement(); + } + }); + return c; + } + = + private ITreeContentProvider getContentProvider() { + return new ITreeContentProvider() { + public Object[] getElements(Object inputElement) { + return ResourcesPlugin.getWorkspace().getRoot().getProjects(); + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInpu= t) { + } + public void dispose() { + } + public boolean hasChildren(Object element) { + return false; + } + public Object getParent(Object element) { + return null; + } + public Object[] getChildren(Object parentElement) { + return null; + } + }; + } + = + private LabelProvider getLabelProvider() { + return new LabelProvider() { + public Image getImage(Object element) { + return PlatformUI.getWorkbench().getSharedImages().getImage(SharedImag= es.IMG_OBJ_PROJECT); + } + public String getText(Object element) { + return element instanceof IProject ? ((IProject)element).getName() : e= lement.toString(); + } + }; + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent parentComp =3D (IVirtualComponent)getTaskModel().getOb= ject(NewReferenceWizard.ROOT_COMPONENT); + selected =3D selected =3D=3D null ? parentComp.getProject() : selected; + OutputFoldersVirtualComponent vc =3D new OutputFoldersVirtualComponent(s= elected, parentComp); + getTaskModel().putObject(NewReferenceWizard.COMPONENT, vc); + getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, "/"); + } +} --===============6988863155051767911==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 17:01:18 2009 Content-Type: multipart/mixed; boundary="===============8234494089964620384==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17627 - in trunk/maven/plugins/org.jboss.tools.maven.seam: src/org/jboss/tools/maven/seam and 2 other directories. Date: Wed, 16 Sep 2009 17:01:18 -0400 Message-ID: <200909162101.n8GL1Iv7026709@svn01.web.mwc.hst.phx2.redhat.com> --===============8234494089964620384== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2009-09-16 17:01:18 -0400 (Wed, 16 Sep 2009) New Revision: 17627 Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/configurators/JSFProjectConfigurator.java Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/MavenSeamActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/preferences/SeamConfiguratorPreferencePage.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/preferences/SeamConfiguratorPreferencesInitializer.java Log: https://jira.jboss.org/jira/browse/JBIDE-4609 maven web projects not shown = in web project view Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-09-16 20= :28:24 UTC (rev 17626) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-09-16 21= :01:18 UTC (rev 17627) @@ -14,6 +14,13 @@ name=3D"Seam Project configurator" priority=3D"200"/> = + + + + = dependencies =3D mavenProject.getDependencies(); + for (Dependency dependency:dependencies) { + String groupId =3D dependency.getGroupId(); + if (groupId !=3D null && (JSF_API_GROUP_ID.equals(groupId) || JSF_AP= I2_GROUP_ID.equals(groupId)) ) { + String artifactId =3D dependency.getArtifactId(); + if (artifactId !=3D null && JSF_API_ARTIFACT_ID.equals(artifactId))= { + return dependency.getVersion(); + } = + } + } + return null; + } + +} Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tool= s/maven/seam/preferences/SeamConfiguratorPreferencePage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencePage.java 2009-09-16 20:28:24 = UTC (rev 17626) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencePage.java 2009-09-16 21:01:18 = UTC (rev 17627) @@ -20,6 +20,7 @@ private Button configureSeamButton; private Button configureSeamRuntimeButton; private Button configureSeamArtifactsButton; + private Button configureJSFButton; = @Override protected Control createContents(Composite parent) { @@ -57,6 +58,11 @@ = }); = + configureJSFButton =3D new Button(composite,SWT.CHECK); + configureJSFButton.setText("Configure JSF facet when importing Maven pro= jects"); + boolean configureJSF =3D store.getBoolean(MavenSeamActivator.CONFIGURE_J= SF); + configureJSFButton.setSelection(configureJSF); + = return composite; } = @@ -65,11 +71,13 @@ = @Override protected void performDefaults() { + configureJSFButton.setSelection(MavenSeamActivator.CONFIGURE_JSF_VALUE); configureSeamButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_VALUE= ); configureSeamRuntimeButton.setSelection(MavenSeamActivator.CONFIGURE_SEA= M_RUNTIME_VALUE); configureSeamArtifactsButton.setSelection(MavenSeamActivator.CONFIGURE_S= EAM_ARTIFACTS_VALUE); IPreferenceStore store =3D MavenSeamActivator.getDefault().getPreference= Store(); store.setValue(MavenSeamActivator.CONFIGURE_SEAM, MavenSeamActivator.CON= FIGURE_SEAM_VALUE); + store.setValue(MavenSeamActivator.CONFIGURE_JSF, MavenSeamActivator.CONF= IGURE_JSF_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, MavenSeamActiv= ator.CONFIGURE_SEAM_RUNTIME_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, MavenSeamAct= ivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); configureSeamRuntimeButton.setEnabled(configureSeamButton.getSelection()= ); @@ -81,6 +89,7 @@ public boolean performOk() { IPreferenceStore store =3D MavenSeamActivator.getDefault().getPreference= Store(); store.setValue(MavenSeamActivator.CONFIGURE_SEAM, configureSeamButton.ge= tSelection()); + store.setValue(MavenSeamActivator.CONFIGURE_JSF, configureJSFButton.getS= election()); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, configureSeamR= untimeButton.getSelection()); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, configureSea= mArtifactsButton.getSelection()); return super.performOk(); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tool= s/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-09-16 2= 0:28:24 UTC (rev 17626) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-09-16 2= 1:01:18 UTC (rev 17627) @@ -22,6 +22,9 @@ node.putBoolean( MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); + node.putBoolean( + MavenSeamActivator.CONFIGURE_JSF, + MavenSeamActivator.CONFIGURE_JSF_VALUE); } = } --===============8234494089964620384==-- From jbosstools-commits at lists.jboss.org Wed Sep 16 19:44:43 2009 Content-Type: multipart/mixed; boundary="===============4001314857203344762==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17628 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist and 4 other directories. Date: Wed, 16 Sep 2009 19:44:43 -0400 Message-ID: <200909162344.n8GNihmW024697@svn01.web.mwc.hst.phx2.redhat.com> --===============4001314857203344762== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-16 19:44:43 -0400 (Wed, 16 Sep 2009) New Revision: 17628 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/SimpleELContext.java Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELCompletionEngine.java 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/ELResolver.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ElVarSearcher.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/XmlContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/el/AbstractELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/el/SeamPromptingProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/t= ext/java/SeamELProposalProcessor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/v= iews/properties/SeamELAttributeContentProposalProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-4860 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELCompletionEngine.java 2009-09-16 21:01:18 UTC (r= ev 17627) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELCompletionEngine.java 2009-09-16 23:44:43 UTC (r= ev 17628) @@ -15,12 +15,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.jboss.tools.common.el.core.model.ELExpression; -import org.jboss.tools.common.el.core.parser.ELParserFactory; = -public interface ELCompletionEngine { +public interface ELCompletionEngine extends ELResolver { = public ELResolution resolveELOperand(IFile file, ELExpression operand, = boolean returnEqualedVariablesOnly, List vars, ElVarSearcher varSe= archer) throws BadLocationException, StringIndexOutOfBoundsException; - - public ELParserFactory getParserFactory(); } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELContextImpl.java 2009-09-16 21:01:18 UTC (rev 17= 627) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELContextImpl.java 2009-09-16 23:44:43 UTC (rev 17= 628) @@ -15,46 +15,19 @@ import java.util.List; import java.util.Map; = -import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.Region; = /** * EL context * @author Alexey Kazakov */ -public class ELContextImpl implements ELContext { +public class ELContextImpl extends SimpleELContext { = - protected IFile resource; - protected ELResolver[] elResolvers; protected Map> vars =3D new HashMap>(= ); protected List allVars =3D new ArrayList(); = /* * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELContext#getElResolvers() - */ - public ELResolver[] getElResolvers() { - return elResolvers; - } - - public void setElResolvers(ELResolver[] elResolvers) { - this.elResolvers =3D elResolvers; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELContext#getResource() - */ - public IFile getResource() { - return resource; - } - - public void setResource(IFile resource) { - this.resource =3D resource; - } - - /* - * (non-Javadoc) * @see org.jboss.tools.common.el.core.resolver.ELContext#getVars() */ public Var[] getVars() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolver.java 2009-09-16 21:01:18 UTC (rev 17627) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolver.java 2009-09-16 23:44:43 UTC (rev 17628) @@ -13,11 +13,11 @@ import java.util.List; = import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.text.TextProposal; = /** * Represents EL Resolver. - * TODO replace old ELResolver interface with this one. * @author Alexey Kazakov */ public interface ELResolver { @@ -36,4 +36,9 @@ * @return */ ELResolution resolve(ELContext context, ELExpression operand); + + /** + * @return EL parser factory + */ + ELParserFactory getParserFactory(); } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ElVarSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ElVarSearcher.java 2009-09-16 21:01:18 UTC (rev 17= 627) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ElVarSearcher.java 2009-09-16 23:44:43 UTC (rev 17= 628) @@ -26,6 +26,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.jboss.tools.common.el.core.Activator; import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.w3c.dom.Element; import org.w3c.dom.Node; = @@ -158,9 +159,32 @@ * @return All var/value that can be used in this position and null if ca= n't find anyone. */ public List findAllVars(IFile file, int offset) { + return findAllVars(file, offset, engine.getParserFactory()); + } + + /** + * @param context + * @param offset + * @param resolver + * @return All var/value that can be used in this position and null if ca= n't find anyone. + */ + public static List findAllVars(ELContext context, int offset, ELReso= lver resolver) { + Node node =3D getNode(context.getResource(), offset); + if(node!=3Dnull) { + return findAllVars(node, resolver.getParserFactory()); + } + return null; + } + + /** + * @param node + * @param factory + * @return All var/value that can be used in this position and null if ca= n't find anyone. + */ + public static List findAllVars(IFile file, int offset, ELParserFacto= ry factory) { Node node =3D getNode(file, offset); if(node!=3Dnull) { - return findAllVars(node); + return findAllVars(node, factory); } return null; } @@ -170,11 +194,19 @@ * @return All var/value that can be used in node and null if can't find = anyone. */ public List findAllVars(Node node) { + return findAllVars(node, engine.getParserFactory()); + } + + /** + * @param node + * @param factory + * @return All var/value that can be used in node and null if can't find = anyone. + */ + public static List findAllVars(Node node, ELParserFactory factory) { ArrayList vars =3D null; -// Node parentNode =3D node.getParentNode(); Node parentNode =3D node; while(parentNode!=3Dnull) { - Var var =3D findVar(parentNode); + Var var =3D findVar(parentNode, factory); if(var!=3Dnull) { if(vars =3D=3D null) { vars =3D new ArrayList(); @@ -205,6 +237,17 @@ * @return found var/value or null */ public Var findVar(Node node) { + return findVar(node, engine.getParserFactory()); + } + + /** + * Finds var/value attribute in node + * @param node + * @param vars + * @param factory + * @return found var/value or null + */ + public static Var findVar(Node node, ELParserFactory factory) { if(node!=3Dnull && Node.ELEMENT_NODE =3D=3D node.getNodeType()) { Element element =3D (Element)node; String var =3D element.getAttribute(VAR_ATTRIBUTE_NAME); @@ -223,7 +266,7 @@ String value =3D element.getAttribute(VALUE_ATTRIBUTE_NAME); if(value!=3Dnull) { value =3D value.trim(); - Var newVar =3D new Var(engine.getParserFactory(), var, value, declOf= fset, declLength); + Var newVar =3D new Var(factory, var, value, declOffset, declLength); if(newVar.getElToken()!=3Dnull) { return newVar; } Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/to= ols/common/el/core/resolver/SimpleELContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/SimpleELContext.java (rev = 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/SimpleELContext.java 2009-09-16 23:44:43 UTC (rev = 17628) @@ -0,0 +1,73 @@ +/*************************************************************************= ****** = + * 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.common.el.core.resolver; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; + +/** + * @author Alexey Kazakov + */ +public class SimpleELContext implements ELContext { + + protected IFile resource; + protected ELResolver[] elResolvers; + protected List vars =3D new ArrayList(); + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELContext#getElResolvers() + */ + public ELResolver[] getElResolvers() { + return elResolvers; + } + + public void setElResolvers(ELResolver[] elResolvers) { + this.elResolvers =3D elResolvers; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELContext#getResource() + */ + public IFile getResource() { + return resource; + } + + public void setResource(IFile resource) { + this.resource =3D resource; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELContext#getVars() + */ + public Var[] getVars() { + return vars.toArray(new Var[vars.size()]); + } + + /** + * @param vars + */ + public void setVars(List vars) { + this.vars =3D vars; + } + + /** + * Adds new Var to the context + * @param vars + */ + public void addVar(Var var) { + vars.add(var); + } +} Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/sr= c/org/jboss/tools/common/el/core/resolver/SimpleELContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/XmlContentAssistProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/XmlContentAssistProcessor.java 2009-09-16 21:01:18 UTC (rev 17= 627) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/XmlContentAssistProcessor.java 2009-09-16 23:44:43 UTC (rev 17= 628) @@ -26,6 +26,7 @@ import org.jboss.tools.common.el.core.resolver.ELResolver; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; import org.jboss.tools.common.el.core.resolver.Var; +import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; import org.jboss.tools.jst.web.kb.KbQuery.Type; @@ -67,6 +68,14 @@ public ELParserFactory getParserFactory() { return ELParserUtil.getJbossFactory(); } + + public List getProposals(ELContext context, String el) { + return null; + } + + public ELResolution resolve(ELContext context, ELExpression operand) { + return null; + } }; ElVarSearcher varSearcher =3D new ElVarSearcher(file, fakeEngine); List vars =3D varSearcher.findAllVars(file, getOffset()); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/el/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-16 21:01:18 UTC (rev 17627) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-16 23:44:43 UTC (rev 17628) @@ -66,80 +66,49 @@ * @see org.jboss.tools.common.el.core.resolver.ELResolver2#getProposals(= org.jboss.tools.common.el.core.resolver.ELContext, java.lang.String) */ public List getProposals(ELContext context, String el) { - return getCompletions(el, false, 0, context); - } + List completions =3D new ArrayList(); = - /* - * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELResolver2#resolve(org.j= boss.tools.common.el.core.resolver.ELContext, org.jboss.tools.common.el.cor= e.model.ELExpression) - */ - public ELResolution resolve(ELContext context, ELExpression operand) { List vars =3D new ArrayList(); Var[] array =3D context.getVars(); for (int i =3D 0; i < array.length; i++) { vars.add(array[i]); } - ELResolutionImpl resolution =3D null; + + ELResolutionImpl resolution; try { - resolution =3D resolveELOperand(context.getResource(), operand, true, v= ars, new ElVarSearcher(context.getResource(), this)); - resolution.setContext(context); + resolution =3D resolveELOperand(context.getResource(), parseOperand(el)= , false, vars, new ElVarSearcher(context.getResource(), this)); + completions.addAll(resolution.getProposals()); } catch (StringIndexOutOfBoundsException e) { log(e); } catch (BadLocationException e) { log(e); } - return resolution; + = + return completions; } = - private List getCompletions(String elString, boolean return= EqualedVariablesOnly, int position, ELContext context) { + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolver#resolve(org.jb= oss.tools.common.el.core.resolver.ELContext, org.jboss.tools.common.el.core= .model.ELExpression) + */ + public ELResolution resolve(ELContext context, ELExpression operand) { List vars =3D new ArrayList(); Var[] array =3D context.getVars(); for (int i =3D 0; i < array.length; i++) { vars.add(array[i]); } - List proposals =3D null; + ELResolutionImpl resolution =3D null; try { - proposals =3D getCompletions(context.getResource(), elString.subSequen= ce(0, elString.length()), position, returnEqualedVariablesOnly, vars); + resolution =3D resolveELOperand(context.getResource(), operand, true, v= ars, new ElVarSearcher(context.getResource(), this)); + resolution.setContext(context); } catch (StringIndexOutOfBoundsException e) { log(e); } catch (BadLocationException e) { log(e); } - return proposals; + return resolution; } = - /** - * Create the list of suggestions. = - * @param seamProject Seam project = - * @param file File = - * @param documentContent - * @param prefix the prefix to search for - * @param position Offset of the prefix = - * @param vars - 'var' attributes which can be used in this EL. Can be nu= ll. - * @param returnEqualedVariablesOnly 'false' if we get proposals for mask= = - * for example: - * we have 'variableName.variableProperty', 'variableName.variablePrope= rty1', 'variableName.variableProperty2' = - * prefix is 'variableName.variableProperty' - * Result is {'variableProperty'} - * if 'false' then returns ends of variables that starts with prefix. It'= s useful for CA. - * for example: - * we have 'variableName.variableProperty', 'variableName.variablePrope= rty1', 'variableName.variableProperty2' - * prefix is 'variableName.variableProperty' - * Result is {'1','2'} - * @return the list of all possible suggestions - * @throws BadLocationException if accessing the current document fails - * @throws StringIndexOutOfBoundsException - */ - public List getCompletions(IFile file, CharSequence prefix, = - int position, boolean returnEqualedVariablesOnly, List vars) throw= s BadLocationException, StringIndexOutOfBoundsException { - List completions =3D new ArrayList(); - - ELResolutionImpl resolution =3D resolveELOperand(file, parseOperand("" += prefix), returnEqualedVariablesOnly, vars, new ElVarSearcher(file, this));= //$NON-NLS-1$ - completions.addAll(resolution.getProposals()); - - return completions; - } - public ELResolution resolveELOperand(ELExpression operand, ELContext cont= ext, boolean returnEqualedVariablesOnly) { List vars =3D new ArrayList(); Var[] array =3D context.getVars(); @@ -184,6 +153,10 @@ return proposals; } = + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELCompletionEngine#resolv= eELOperand(org.eclipse.core.resources.IFile, org.jboss.tools.common.el.core= .model.ELExpression, boolean, java.util.List, org.jboss.tools.common.el.cor= e.resolver.ElVarSearcher) + */ public ELResolutionImpl resolveELOperand(IFile file, ELExpression operand, boolean returnEqualedVariablesOnly, List vars, ElVarSearcher varSearcher) Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/el/SeamPromptingProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamPromptingProvider.java 2009-09-16 21:01:18 UTC (rev 176= 27) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/el/SeamPromptingProvider.java 2009-09-16 23:44:43 UTC (rev 176= 28) @@ -17,8 +17,7 @@ import java.util.TreeSet; = import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.BadLocationException; -import org.jboss.tools.common.el.core.resolver.Var; +import org.jboss.tools.common.el.core.resolver.SimpleELContext; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.project.IPromptingProvider; import org.jboss.tools.common.text.TextProposal; @@ -58,16 +57,14 @@ list.addAll(set); return list; } else if(MEMBERS.equals(id)) { - try { - List proposals =3D engine.getCompletions(f, prefix, pref= ix.length(), false, new ArrayList()); - List suggestions =3D new ArrayList(); - if(proposals !=3D null) for (TextProposal proposal: proposals) { - suggestions.add(proposal.getReplacementString()); - } - return suggestions; - } catch (BadLocationException e) { - return EMPTY_LIST; + SimpleELContext context =3D new SimpleELContext(); + context.setResource(f); + List proposals =3D engine.getProposals(context, prefix); + List suggestions =3D new ArrayList(); + if(proposals !=3D null) for (TextProposal proposal: proposals) { + suggestions.add(proposal.getReplacementString()); } + return suggestions; } return null; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/text/java/SeamELProposalProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= text/java/SeamELProposalProcessor.java 2009-09-16 21:01:18 UTC (rev 17627) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= text/java/SeamELProposalProcessor.java 2009-09-16 23:44:43 UTC (rev 17628) @@ -59,6 +59,7 @@ import org.jboss.tools.common.el.core.model.ELModel; import org.jboss.tools.common.el.core.model.ELUtil; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.SimpleELContext; import org.jboss.tools.common.el.core.resolver.Var; import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor; import org.jboss.tools.common.text.TextProposal; @@ -436,7 +437,10 @@ List vars =3D varSearcher.findAllVars(viewer, offset); = SeamELCompletionEngine fEngine=3D new SeamELCompletionEngine(); - List suggestions =3D fEngine.getCompletions(file, prefix,= offset + proposalPrefix.length() - prefix.length(), false, vars); + SimpleELContext elContext =3D new SimpleELContext(); + elContext.setResource(file); + elContext.setVars(vars); + List suggestions =3D fEngine.getProposals(elContext, pref= ix); List uniqueSuggestions =3D fEngine.makeKbUnique(suggestio= ns); = List result=3D new ArrayList(= ); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/views/properties/SeamELAttributeContentProposalProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= views/properties/SeamELAttributeContentProposalProvider.java 2009-09-16 21:= 01:18 UTC (rev 17627) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= views/properties/SeamELAttributeContentProposalProvider.java 2009-09-16 23:= 44:43 UTC (rev 17628) @@ -19,12 +19,12 @@ import org.eclipse.jface.fieldassist.ContentProposalAdapter; import org.eclipse.jface.fieldassist.IContentProposal; import org.eclipse.jface.fieldassist.IContentProposalProvider; -import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.viewers.LabelProvider; import org.jboss.tools.common.el.core.model.ELInstance; import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.model.ELModel; import org.jboss.tools.common.el.core.model.ELUtil; +import org.jboss.tools.common.el.core.resolver.SimpleELContext; import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposal= Provider; @@ -32,7 +32,6 @@ import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine; -import org.jboss.tools.seam.ui.SeamGuiPlugin; = /** * @author Viacheslav Kabanovich @@ -109,11 +108,9 @@ if(prefix =3D=3D null) prefix =3D ""; = List suggestions =3D null; - try { - suggestions =3D engine.getCompletions(file, prefix, position, false, n= ull); - } catch (BadLocationException e) { - SeamGuiPlugin.getPluginLog().logError(e); - } + SimpleELContext context =3D new SimpleELContext(); + context.setResource(file); + suggestions =3D engine.getProposals(context, prefix); if(suggestions =3D=3D null) { return EMPTY; } --===============4001314857203344762==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 02:20:46 2009 Content-Type: multipart/mixed; boundary="===============6588357075268069327==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17629 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor. Date: Thu, 17 Sep 2009 02:20:41 -0400 Message-ID: <200909170620.n8H6Kfpl004076@svn01.web.mwc.hst.phx2.redhat.com> --===============6588357075268069327== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2009-09-17 02:20:40 -0400 (Thu, 17 Sep 2009) New Revision: 17629 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= EditorPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-4671, JUnit for JBIDE-3127 was fix= ed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeEditorPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.java 2009-09-16 23:44:43 UTC (rev 17628) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.java 2009-09-17 06:20:40 UTC (rev 17629) @@ -598,34 +598,19 @@ = final ControlListener visualContentControlListener =3D new ControlListen= er() { public void controlMoved(ControlEvent event) { - + = } = public void controlResized(ControlEvent event) { - Point point =3D visualContent.getSize(); - if (point.x =3D=3D 0 || point.y =3D=3D 0) { - VpeController controller =3D getController(); - if (controller !=3D null) - controller.setVisualEditorVisible(false); - } else { - VpeController controller =3D getController(); - if (controller !=3D null - && !controller.isVisualEditorVisible()) { - controller.setVisualEditorVisible(true); - if (!controller.isSynced()) - controller.visualRefresh(); - } - } + updateVisualEditorVisibility(); } }; visualContent.addControlListener(visualContentControlListener); visualContent.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent e) { visualContent.removeControlListener(visualContentControlListener); visualContent.removeDisposeListener(this); } - }); = // createVisualEditor(); @@ -833,7 +818,7 @@ * Reset the container. */ container =3D newContainer; - = + /* * Set up new sash weights */ @@ -1132,15 +1117,55 @@ } = public void maximizeSource() { - if (container !=3D null) - container.maxDown(); + if (container !=3D null) { + if (CustomSashForm.isSourceEditorFirst()) { + container.maxDown(); + } else { + container.maxUp(); + } + /* + * In JUnit for JBIDE-3127 on manual maximizing + * SashForm control listener isn't fired up + * do it here. + */ + updateVisualEditorVisibility(); + } } = public void maximizeVisual() { - if (container !=3D null) - container.maxUp(); + if (container !=3D null) { + if (CustomSashForm.isSourceEditorFirst()) { + container.maxUp(); + } else { + container.maxDown(); + } + /* + * In JUnit for JBIDE-3127 on manual maximizing + * SashForm control listener isn't fired up + * do it here. + */ + updateVisualEditorVisibility(); + } } = + protected void updateVisualEditorVisibility() { + Point point =3D visualContent.getSize(); + if (point.x =3D=3D 0 || point.y =3D=3D 0) { + VpeController controller =3D getController(); + if (controller !=3D null) + controller.setVisualEditorVisible(false); + } else { + VpeController controller =3D getController(); + if (controller !=3D null + && !controller.isVisualEditorVisible()) { + controller.setVisualEditorVisible(true); + if (!controller.isSynced()) { + controller.visualRefresh(); + } + } + } + } + = /* * Updates current VpeEditorPart after = * OK/Apply button on "Visual Page Editor" preference page --===============6588357075268069327==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 04:17:47 2009 Content-Type: multipart/mixed; boundary="===============2850215212143243695==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17630 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory. Date: Thu, 17 Sep 2009 04:17:47 -0400 Message-ID: <200909170817.n8H8Hlc8028584@svn01.web.mwc.hst.phx2.redhat.com> --===============2850215212143243695== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2009-09-17 04:17:46 -0400 (Thu, 17 Sep 2009) New Revision: 17630 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/men= u/InsertContributionItem.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/men= u/InsertType.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-3504, context menu structure was u= pdated, "From Palette" menu item was removed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/menu/InsertContributionItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/InsertContributionItem.java 2009-09-17 06:20:40 UTC (rev 17629) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/InsertContributionItem.java 2009-09-17 08:17:46 UTC (rev 17630) @@ -81,29 +81,6 @@ @Override public void fill(Menu menu, int index) { /* - * https://jira.jboss.org/jira/browse/JBIDE-3504 = - * Adding 'Insert tag from Palette' menu item. - */ - final MenuItem fromPaletteItem; - if (index < 0) { - fromPaletteItem =3D new MenuItem(menu, SWT.CASCADE); - } else { - fromPaletteItem =3D new MenuItem(menu, SWT.CASCADE, index); - } - /* - * Increasing parent menu item index. - */ - index++; - fromPaletteItem.setText(VpeUIMessages.FROM_PALETTE); - /* - * Creating menu for 'Insert tag from Palette' item. - */ - final Menu fromPaletteMenu =3D new Menu(menu); - /* - * Tie menu with the item. - */ - fromPaletteItem.setMenu(fromPaletteMenu); - /* * Setting each InsertType to correct position in the menu */ for (final InsertType insertItem : InsertType.values()) { @@ -113,26 +90,12 @@ final MenuManager paletteManuManager =3D new MenuManager( insertItem.getMessage()); final XModelObject model =3D ModelUtilities.getPreferenceModel() - .getByPath("%Palette%"); //$NON-NLS-1$ + .getByPath("%Palette%"); //$NON-NLS-1$ paletteManuManager.addMenuListener(new InsertMenuListener( model, insertItem)); paletteManuManager.setRemoveAllWhenShown(true); - /* - * Place menu items to the correct menu. - */ - if (insertItem.equals(InsertType.REPLACE_WITH)) { - /* - * Replace item will be placed in the parent menu. = - * Because of this its position index is required. - */ - paletteManuManager.fill(menu, index); - index++; - } else { - /* - * Fill 'Insert tag from palette' menu with insert items. - */ - paletteManuManager.fill(fromPaletteMenu, -1); - } + paletteManuManager.fill(menu, index); + index++; } } = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/menu/InsertType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/InsertType.java 2009-09-17 06:20:40 UTC (rev 17629) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/InsertType.java 2009-09-17 08:17:46 UTC (rev 17630) @@ -19,8 +19,8 @@ INSERT_AROUND(VpeUIMessages.INSERT_AROUND), INSERT_BEFORE(VpeUIMessages.INSERT_BEFORE), INSERT_AFTER(VpeUIMessages.INSERT_AFTER), - REPLACE_WITH(VpeUIMessages.REPLACE_WITH), - INSERT_INTO(VpeUIMessages.INSERT_INTO); + INSERT_INTO(VpeUIMessages.INSERT_INTO), + REPLACE_WITH(VpeUIMessages.REPLACE_WITH); = private String message; = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2009-09-17 06:20:40 UTC (rev 17629) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2009-09-17 08:17:46 UTC (rev 17630) @@ -81,11 +81,11 @@ BaseActionManager_InsertTag=3DInsert Tag BaseActionManager_ReplaceWith=3DReplace With SETUP_TEMPLATE_FOR_MENU=3DSetup Template for <{0}>... -INSERT_AROUND=3DAround -INSERT_BEFORE=3DBefore -INSERT_AFTER=3DAfter -REPLACE_WITH=3DReplace with Palette tag -INSERT_INTO=3DInto +INSERT_AROUND=3DInsert around +INSERT_BEFORE=3DInsert before +INSERT_AFTER=3DInsert after +INSERT_INTO=3DInsert into +REPLACE_WITH=3DReplace with FROM_PALETTE=3DInsert tag from Palette PAGE_DESIGN_OPTIONS_ABOUT=3DHere you can configure Visual Page Editor opti= ons, which will be used for generating a preview ACTUAL_RUN_TIME_FOLDERS_ABOUT=3DThese options will be used by Visual Page = Editor for replacing absolute and relative path values when generating a pr= eview --===============2850215212143243695==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 08:11:41 2009 Content-Type: multipart/mixed; boundary="===============4119387046307565777==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17631 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences. Date: Thu, 17 Sep 2009 08:11:41 -0400 Message-ID: <200909171211.n8HCBfjP010300@svn01.web.mwc.hst.phx2.redhat.com> --===============4119387046307565777== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-17 08:11:40 -0400 (Thu, 17 Sep 2009) New Revision: 17631 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/pref= erences/JSFFlowTabbedPreferencesPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4896 https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/preferences/JSFFlowTabbedPreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/pre= ferences/JSFFlowTabbedPreferencesPage.java 2009-09-17 08:17:46 UTC (rev 176= 30) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/pre= ferences/JSFFlowTabbedPreferencesPage.java 2009-09-17 12:11:40 UTC (rev 176= 31) @@ -10,6 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.jsf.ui.preferences; = +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.model.ui.preferences.*; import org.eclipse.ui.*; import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintALi= st; @@ -20,8 +21,8 @@ = public static final String ID =3D "org.jboss.tools.jsf.ui.jsfflowdiagram"= ; //$NON-NLS-1$ = - public static String JSF_EDITOR_PATH =3D "%Options%/Struts Studio/Editors= /JSF Flow Diagram"; //$NON-NLS-1$ - public static String JSF_ADD_VIEW_PATH =3D "%Options%/Struts Studio/Edito= rs/JSF Flow Diagram/Add View"; //$NON-NLS-1$ + public static String JSF_EDITOR_PATH =3D Preference.EDITOR_PATH + "/JSF F= low Diagram"; //$NON-NLS-1$ + public static String JSF_ADD_VIEW_PATH =3D Preference.EDITOR_PATH + "/JSF= Flow Diagram/Add View"; //$NON-NLS-1$ = public JSFFlowTabbedPreferencesPage() { XModel model =3D getPreferenceModel(); --===============4119387046307565777==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 08:14:52 2009 Content-Type: multipart/mixed; boundary="===============5198067464863881395==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17632 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model. Date: Thu, 17 Sep 2009 08:14:52 -0400 Message-ID: <200909171214.n8HCEqaK010884@svn01.web.mwc.hst.phx2.redhat.com> --===============5198067464863881395== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-17 08:14:52 -0400 (Thu, 17 Sep 2009) New Revision: 17632 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/se= am/pages/xml/model/SeamPagesPreference.java Log: https://jira.jboss.org/jira/browse/JBIDE-4896 https://jira.jboss.org/jira/browse/JBIDE-4885 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/t= ools/seam/pages/xml/model/SeamPagesPreference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/s= eam/pages/xml/model/SeamPagesPreference.java 2009-09-17 12:11:40 UTC (rev 1= 7631) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/s= eam/pages/xml/model/SeamPagesPreference.java 2009-09-17 12:14:52 UTC (rev 1= 7632) @@ -5,7 +5,7 @@ import org.jboss.tools.jst.web.WebPreference; = public class SeamPagesPreference extends WebPreference { - public static String SEAM_PAGES_EDITOR_PATH =3D "%Options%/Struts Studio/= Editors/Seam Pages Diagram"; + public static String SEAM_PAGES_EDITOR_PATH =3D Preference.EDITOR_PATH + = "/Seam Pages Diagram"; = public static final Preference ENABLE_CONTROL_MODE_ON_TRANSITION_COMPLETE= D =3D new SeamPagesPreference(SEAM_PAGES_EDITOR_PATH, "enableControlModeOnT= ransitionCompleted"); public static final Preference SHOW_SHORTCUT_ICON =3D new SeamPagesPrefer= ence(SEAM_PAGES_EDITOR_PATH, "showShortcutIcon"); --===============5198067464863881395==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 09:59:09 2009 Content-Type: multipart/mixed; boundary="===============8225931325016540491==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17633 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor. Date: Thu, 17 Sep 2009 09:59:09 -0400 Message-ID: <200909171359.n8HDx9cS028386@svn01.web.mwc.hst.phx2.redhat.com> --===============8225931325016540491== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-17 09:59:09 -0400 (Thu, 17 Sep 2009) New Revision: 17633 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/editor/ObjectMultiPageEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-4900 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/editor/ObjectMultiPageEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/ObjectMultiPageEditor.java 2009-09-17 12:14:52 UTC (rev 176= 32) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/editor/ObjectMultiPageEditor.java 2009-09-17 13:59:09 UTC (rev 176= 33) @@ -552,7 +552,8 @@ } = public void update0() { - setContentDescription(getEditorInput().getName()); +// setContentDescription(getEditorInput().getName()); + setPartName(getEditorInput().getName()); checkErrorMode(); if(isErrorMode) { setErrorMode(); @@ -1014,7 +1015,11 @@ } = void updateTitle() { - setPartName(getEditorInput().getName()); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + setPartName(getEditorInput().getName()); + } + }); } = class PostMultiPageEditorSite extends MultiPageEditorSite { --===============8225931325016540491==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 10:37:38 2009 Content-Type: multipart/mixed; boundary="===============7283967412144866336==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17634 - in trunk: seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring and 1 other directories. Date: Thu, 17 Sep 2009 10:37:38 -0400 Message-ID: <200909171437.n8HEbcos002753@svn01.web.mwc.hst.phx2.redhat.com> --===============7283967412144866336== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2009-09-17 10:37:38 -0400 (Thu, 17 Sep 2009) New Revision: 17634 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ELResolutionImpl.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRefactorSearcher.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/s= earch/SeamELReferencesQueryParticipant.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ELResolutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java 2009-09-17 13:59:09 UTC (rev= 17633) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ELResolutionImpl.java 2009-09-17 14:37:38 UTC (rev= 17634) @@ -36,15 +36,22 @@ * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegments= ByJavaElement(org.eclipse.jdt.core.IJavaElement) */ public List findSegmentsByJavaElement(IJavaElement element) { - // TODO - return null; + ArrayList list =3D new ArrayList(); + for(ELSegment segment : segments){ + if(segment instanceof JavaMemberELSegment && ((JavaMemberELSegment)segm= ent).getJavaElement().equals(element)) + list.add(segment); + } + return list; } = /* (non-Javadoc) * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentB= yOffset(int) */ - public ELSegment findSegmentByOffset(int offcet) { - // TODO + public ELSegment findSegmentByOffset(int offset) { + for(ELSegment segment : segments){ + if(segment.getSourceReference() !=3D null && segment.getSourceReference= ().getStartPosition() =3D=3D offset) + return segment; + } return null; } = Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRefactorSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-17 13:59:09 UTC = (rev 17633) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-17 14:37:38 UTC = (rev 17634) @@ -11,6 +11,7 @@ package org.jboss.tools.seam.internal.core.refactoring; = import java.io.IOException; +import java.util.List; import java.util.StringTokenizer; = import org.eclipse.core.resources.IContainer; @@ -19,6 +20,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner; import org.eclipse.jdt.ui.text.IJavaPartitions; @@ -36,6 +38,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; +import org.jboss.tools.common.el.core.model.ELExpression; import org.jboss.tools.common.el.core.model.ELInstance; import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.model.ELMethodInvocation; @@ -43,6 +46,15 @@ import org.jboss.tools.common.el.core.model.ELPropertyInvocation; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager; +import org.jboss.tools.common.el.core.resolver.ELSegment; +import org.jboss.tools.common.el.core.resolver.ElVarSearcher; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment; +import org.jboss.tools.common.el.core.resolver.SimpleELContext; +import org.jboss.tools.common.el.core.resolver.Var; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.seam.core.SeamCorePlugin; @@ -66,11 +78,17 @@ = protected IFile baseFile; protected String propertyName; + protected IJavaElement javaElement; = public SeamRefactorSearcher(IFile baseFile, String propertyName){ this.baseFile =3D baseFile; this.propertyName =3D propertyName; } + = + public SeamRefactorSearcher(IFile baseFile, String propertyName, IJavaEle= ment javaElement){ + this(baseFile, propertyName); + this.javaElement =3D javaElement; + } = public void findELReferences(){ if(baseFile =3D=3D null) @@ -253,10 +271,10 @@ if(expression !=3D null){ if(expression instanceof ELPropertyInvocation){ ELPropertyInvocation pi =3D (ELPropertyInvocation)expression; - match(file, offset+pi.getName().getStart(), pi.getName().getLength(= )); + checkMatch(file, pi, offset+pi.getName().getStart(), pi.getName().g= etLength()); }else if(expression instanceof ELMethodInvocation){ ELMethodInvocation mi =3D (ELMethodInvocation)expression; - match(file, offset+mi.getName().getStart(), mi.getName().getLength(= )); + checkMatch(file, mi, offset+mi.getName().getStart(), mi.getName().g= etLength()); } } } @@ -324,6 +342,13 @@ = protected abstract void match(IFile file, int offset, int length); = + private void checkMatch(IFile file, ELExpression operand, int offset, int= length){ + if(javaElement !=3D null && operand !=3D null) + resolve(file, operand, offset, length); + else + match(file, offset, length); + } + = public static String getPropertyName(String methodName){ if(methodName.startsWith(GET) || methodName.startsWith(SET)){ String name =3D methodName.substring(3); @@ -339,8 +364,47 @@ } = public static boolean isSetter(String methodName){ - if(methodName.startsWith(SET)) - return true; - return false; + return methodName.startsWith(SET); } + = + private void resolve(IFile file, ELExpression operand, int offset, int le= ngth){ + ELResolver[] resolvers =3D ELResolverFactoryManager.getInstance().getRes= olvers(file); + = + for(ELResolver resolver : resolvers){ + if(!(resolver instanceof ELCompletionEngine)) + continue; + = + SimpleELContext context =3D new SimpleELContext(); + = + ElVarSearcher elSearcher =3D new ElVarSearcher((ELCompletionEngine)reso= lver); + = + List vars =3D elSearcher.findAllVars(file, offset); + = + if(vars =3D=3D null) + continue; + = + context.setVars(vars); + context.setResource(file); + context.setElResolvers(resolvers); + = + ELResolution resolution =3D resolver.resolve(context, operand); + = + if(resolution =3D=3D null) + continue; + = + ELSegment segment =3D resolution.findSegmentByOffset(offset); + = + if(segment =3D=3D null) + continue; + + if(segment instanceof JavaMemberELSegment){ + JavaMemberELSegment javaSegment =3D (JavaMemberELSegment)segment; + if(javaSegment.isResolved()){ + IJavaElement segmentJavaElement =3D javaSegment.getJavaElement(); + if(segmentJavaElement.equals(javaElement)) + match(file, offset, length); + } + } + } + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/search/SeamELReferencesQueryParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= search/SeamELReferencesQueryParticipant.java 2009-09-17 13:59:09 UTC (rev 1= 7633) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= search/SeamELReferencesQueryParticipant.java 2009-09-17 14:37:38 UTC (rev 1= 7634) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.ui.search.ElementQuerySpecification; import org.eclipse.jdt.ui.search.IMatchPresentation; @@ -49,7 +50,7 @@ IFile file =3D (IFile)qs.getElement().getResource(); String name =3D ELSearcher.getPropertyName(qs.getElement().getElementN= ame()); = - searcher =3D new ELSearcher(requestor, file, name); + searcher =3D new ELSearcher(requestor, qs.getElement(), file, name); = searcher.findELReferences(); } @@ -66,8 +67,8 @@ = class ELSearcher extends SeamRefactorSearcher{ ISearchRequestor requestor; - public ELSearcher(ISearchRequestor requestor, IFile file, String name){ - super(file, name); + public ELSearcher(ISearchRequestor requestor, IJavaElement element, IFil= e file, String name){ + super(file, name, element); this.requestor =3D requestor; } = --===============7283967412144866336==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 10:57:49 2009 Content-Type: multipart/mixed; boundary="===============0845994052323603726==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17635 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: jspeditor and 1 other directory. Date: Thu, 17 Sep 2009 10:57:49 -0400 Message-ID: <200909171457.n8HEvnXT005968@svn01.web.mwc.hst.phx2.redhat.com> --===============0845994052323603726== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-17 10:57:48 -0400 (Thu, 17 Sep 2009) New Revision: 17635 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/AutoContentAssistantProposal.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/JSPTextEditor.java Log: JBIDE-512 context variable code completion dropdown should show their "sour= ce" JBIDE-2541 Show java-doc for EL content assist item The values of type, sourceType and JavaDoc are gathered to be displayed in = CA CA shows proposals for EL in a Java-like manner Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/AutoContentAssistantProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/AutoContentAssistantProposal.java 2009-09-17 14:37:38 UTC (rev= 17634) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/AutoContentAssistantProposal.java 2009-09-17 14:57:48 UTC (rev= 17635) @@ -12,8 +12,10 @@ = import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.contentassist.ICompletionProposalExtension6; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.viewers.StyledString; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionPropo= sal; @@ -22,8 +24,10 @@ /** * @author Igels */ -public class AutoContentAssistantProposal extends CustomCompletionProposal= { +public class AutoContentAssistantProposal extends CustomCompletionProposal= implements ICompletionProposalExtension6 = = +{ + private boolean autoContentAssistant =3D false; = public AutoContentAssistantProposal(String replacementString, int replace= mentOffset, int replacementLength, int cursorPosition, Image image, String = displayString, IContextInformation contextInformation, String additionalPro= posalInfo) { @@ -72,4 +76,55 @@ } return cursorPosition>-1?cursorPosition:super.getCursorPosition(); } + + = + StyledString fStyledDisplayString; + = + public String getDisplayString() { + if (super.getDisplayString() !=3D null) + return super.getDisplayString(); + else { + if (super.getReplacementString() !=3D null) { = + setDisplayString(super.getReplacementString()); + return super.getDisplayString(); + } + } + return ""; //$NON-NLS-1$ + } + = + public void setDisplayString(String string) { + super.setDisplayString(string); + = + boolean isJavaWordPart =3D string.length() > 0 && Character.isJavaIdent= ifierPart(string.charAt(0)); + boolean hasRetType =3D isJavaWordPart && string.indexOf(':') > 0; + boolean hasDeclType =3D isJavaWordPart && string.lastIndexOf('-') > 0; + = + int p1i =3D string.indexOf(':'); + int p2i =3D string.lastIndexOf('-'); + = + String p1 =3D hasRetType && hasDeclType ? string.substring(0, p2i) : str= ing; + String p2 =3D string.substring(p1.length()); + = + StyledString styledString =3D new StyledString(); + + // name, attrs, type + styledString.append(p1); + + // decl type + if (p2 !=3D null && p2.length() > 0) = + styledString.append(p2, StyledString.QUALIFIER_STYLER); + fStyledDisplayString =3D styledString; = + } + = + public StyledString getStyledDisplayString() { + if (fStyledDisplayString =3D=3D null) { + setDisplayString(super.getDisplayString()); // This re-creates Styled D= isplay String + } + return fStyledDisplayString; + } + = + public void setStyledDisplayString(StyledString text) { + fStyledDisplayString =3D text; + super.setDisplayString(fStyledDisplayString =3D=3D null ? "" : fStyledDi= splayString.getString()); + } } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/JSPTextEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPTextEditor.java 2009-09-17 14:37:38 UTC (rev 17634) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPTextEditor.java 2009-09-17 14:57:48 UTC (rev 17635) @@ -27,6 +27,8 @@ import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.TextEvent; +import org.eclipse.jface.text.contentassist.ContentAssistant; +import org.eclipse.jface.text.contentassist.IContentAssistant; import org.eclipse.jface.text.formatter.IContentFormatter; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.source.IAnnotationModel; @@ -411,6 +413,10 @@ IVerticalRuler ruler, int styles) { ISourceViewer sv =3D super.createSourceViewer(parent, ruler, styles); sv.getTextWidget().addFocusListener(new TextFocusListener()); + IContentAssistant ca =3D getSourceViewerConfiguration().getContentAssist= ant(sv); + if (ca instanceof ContentAssistant) { + ((ContentAssistant)ca).enableColoredLabels(true); + } return sv; } = --===============0845994052323603726==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 11:42:04 2009 Content-Type: multipart/mixed; boundary="===============3460868041249161616==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17636 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta. Date: Thu, 17 Sep 2009 11:42:04 -0400 Message-ID: <200909171542.n8HFg41H013582@svn01.web.mwc.hst.phx2.redhat.com> --===============3460868041249161616== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-17 11:42:04 -0400 (Thu, 17 Sep 2009) New Revision: 17636 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/met= a/hibconfig3.meta Log: https://jira.jboss.org/jira/browse/JBIDE-2607 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resour= ces/meta/hibconfig3.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/me= ta/hibconfig3.meta 2009-09-17 14:57:48 UTC (rev 17635) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/me= ta/hibconfig3.meta 2009-09-17 15:42:04 UTC (rev 17636) @@ -942,17 +942,47 @@ + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.c3p0.acquire_i= ncrement" name=3D"acquire increment"> + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.c3p0.idle_test= _period" name=3D"idle test period"> + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.c3p0.max_size"= name=3D"max size"> + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.c3p0.max_state= ments" name=3D"max statements"> + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.c3p0.min_size"= name=3D"min size"> + + + + + + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.c3p0.timeout" = name=3D"timeout"> + + + + + @@ -987,40 +1017,16 @@ PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.cache.jndi" na= me=3D"jndi"/> - - - - - - - - - - - - + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.cache.provider= _configuration_file_resource_path" name=3D"provider configuration file"/> - - - - - - - - - - - - + PROPERTIES=3D"category=3Dgeneral;h_property=3Dhibernate.cache.region_p= refix" name=3D"region prefix"/> @@ -1221,6 +1227,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --===============3460868041249161616==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 11:43:17 2009 Content-Type: multipart/mixed; boundary="===============0237380426873663453==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17637 - trunk/jsf/docs/userguide/en/modules. Date: Thu, 17 Sep 2009 11:43:17 -0400 Message-ID: <200909171543.n8HFhHTJ013664@svn01.web.mwc.hst.phx2.redhat.com> --===============0237380426873663453== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: chukhutsina Date: 2009-09-17 11:43:17 -0400 (Thu, 17 Sep 2009) New Revision: 17637 Modified: trunk/jsf/docs/userguide/en/modules/css_perspective.xml Log: https://jira.jboss.org/jira/browse/JBDS-864 - Updated the CSS Perspectiv= e chapter with the info about supporting editing style sheets being inserte= d in any of possible places. Modified: trunk/jsf/docs/userguide/en/modules/css_perspective.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en/modules/css_perspective.xml 2009-09-17 15:4= 2:04 UTC (rev 17636) +++ trunk/jsf/docs/userguide/en/modules/css_perspective.xml 2009-09-17 15:4= 3:17 UTC (rev 17637) @@ -13,10 +13,21 @@ your css files,edit them and see the results. To use this perspective you need to choose Win= dow >Open Perspective> CSS Editing .All of the views are fully synchronized with each other:the chang= es being made in one view are reflected in othes at once. - In CSS Editing Perspective you can change your css file in thre= e ways: + As you know, there are three ways of inserting a style sheet: + = + External style sheet (.css file) + + Internal style sheet (using the <style> tag in the head section of an HTML/XH= TML/JSP page) + + Inline style (using style attribute) + + + Using CSS Editing Perspective you can change your style sheet, + inserted in any of the possible places described before, in three = ways: + - directly in your CSS Editor + directly in your Editor --===============0237380426873663453==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 11:48:54 2009 Content-Type: multipart/mixed; boundary="===============8602856684816058905==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17638 - trunk/jsf/docs/userguide/en/images/visual_page. Date: Thu, 17 Sep 2009 11:48:54 -0400 Message-ID: <200909171548.n8HFmsaD014304@svn01.web.mwc.hst.phx2.redhat.com> --===============8602856684816058905== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2009-09-17 11:48:54 -0400 (Thu, 17 Sep 2009) New Revision: 17638 Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png Log: JBDS-787 - screenshot adjusted Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============8602856684816058905==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 12:41:17 2009 Content-Type: multipart/mixed; boundary="===============8279351936278803202==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17639 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el. Date: Thu, 17 Sep 2009 12:41:17 -0400 Message-ID: <200909171641.n8HGfHGE024004@svn01.web.mwc.hst.phx2.redhat.com> --===============8279351936278803202== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-17 12:41:17 -0400 (Thu, 17 Sep 2009) New Revision: 17639 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/el/AbstractELCompletionEngine.java Log: JBIDE-4860: Improve/refactor JBT EL resolvers. JavaElements are set for the segments = Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/el/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-17 15:48:54 UTC (rev 17638) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-17 16:41:17 UTC (rev 17639) @@ -488,7 +488,8 @@ proposal.setContextInfo(attachedJavaDoc); proposals.add(proposal); } - segment.setMemberInfo(bijectedAttribute!=3Dnull?bijectedAttribute:getM= emberInfoByVariable(var, true)); + segment.setMemberInfo(bijectedAttribute!=3Dnull?bijectedAttribute:memb= er); + segment.setElement(bijectedAttribute!=3Dnull?bijectedAttribute.getJava= Element():member!=3Dnull?member.getJavaElement():null); segment.getVariables().add(var); } // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes @@ -507,6 +508,7 @@ if (member !=3D null && !members.contains(member)) { = members.add(member); segment.setMemberInfo(member); + segment.setElement(member.getJavaElement()); segment.getVariables().add(var); segment.setResolved(true); } @@ -532,7 +534,8 @@ members =3D resolveSegment(left, members, resolution, returnEqualedV= ariablesOnly, varIsUsed, segment); } if(!members.isEmpty()) { - segment.setMemberInfo(members.get(0)); + segment.setMemberInfo(members.get(0)); // TODO: This is a buggy way = to select a member to setup in a segment + segment.setElement(members.get(0).getJavaElement()); } resolution.addSegment(segment); } else { // Last segment @@ -773,6 +776,7 @@ proposalsToFilter.addAll(infos.getMethodPresentations()); proposalsToFilter.addAll(infos.getPropertyPresentations(segment.getUnp= airedGettersOrSetters())); segment.setMemberInfo(mbr); + segment.setElement(mbr!=3Dnull?mbr.getJavaElement():null); } for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter)= { // We do expect nothing but name for method tokens (No round brackets) @@ -789,6 +793,7 @@ kbProposals.add(kbProposal); = segment.setMemberInfo(proposal.getMember()); + segment.setElement(proposal.getMember()!=3Dnull?proposal.getMember()= .getJavaElement():null); if(segment.getUnpairedGettersOrSetters()!=3Dnull) { TypeInfoCollector.MethodInfo unpirMethod =3D segment.getUnpairedGet= tersOrSetters().get(filter); segment.clearUnpairedGettersOrSetters(); @@ -850,6 +855,7 @@ WebKbPlugin.getDefault().logError(jme); } segment.setMemberInfo(mbr); + segment.setElement(mbr!=3Dnull?mbr.getJavaElement():null); } = String filter =3D expr.getMemberName(); @@ -882,6 +888,7 @@ kbProposals.add(kbProposal); = segment.setMemberInfo(proposal.getMember()); + segment.setElement(proposal.getMember()!=3Dnull?proposal.getMember()= .getJavaElement():null); if(segment.getUnpairedGettersOrSetters()!=3Dnull) { TypeInfoCollector.MethodInfo unpirMethod =3D segment.getUnpairedGet= tersOrSetters().get(filter); segment.clearUnpairedGettersOrSetters(); --===============8279351936278803202==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 13:18:23 2009 Content-Type: multipart/mixed; boundary="===============2263554751601794299==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17640 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram: editors and 4 other directories. Date: Thu, 17 Sep 2009 13:18:22 -0400 Message-ID: <200909171718.n8HHIMac030276@svn01.web.mwc.hst.phx2.redhat.com> --===============2263554751601794299== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2009-09-17 13:18:22 -0400 (Thu, 17 Sep 2009) New Revision: 17640 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ActionMenu.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/RefreshAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ToggleAssociationAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ToggleClassMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ToggleForeignKeyConstraintAction= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/TogglePropertyMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/toggleassociation.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/toggleclassmapping.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/toggleforeignkeyconstraint.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/togglepropertymapping.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/toggleshapeexpandstate2.png Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/DiagramViewerMessages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/DiagramViewerMessages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/DiagramViewer.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.ja= va trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/autolayout.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/toggleconnections.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/toggleshapeexpandstate.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/icons/toggleshapevisiblestate.png trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/model/Connection.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/model/Shape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-4873, https://jira.jboss.org/jira/= browse/JBIDE-4620 - gui update (icons, toolbar, menu, new action, small bug= fix) Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/DiagramViewerMessages.java 2009-09-17 16:41:17 = UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/DiagramViewerMessages.java 2009-09-17 17:18:22 = UTC (rev 17640) @@ -53,4 +53,8 @@ public static String DiagramViewer_OutlinePage_Sort_label; public static String DiagramViewer_OutlinePage_Sort_tooltip; public static String DiagramViewer_OutlinePage_Sort_description; + public static String ToggleClassMappingAction_class_mappings; + public static String TogglePropertyMappingAction_property_mappings; + public static String ToggleAssociationAction_associations; + public static String ToggleForeignKeyConstraintAction_foreign_key_constra= ints; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-09-17 16:= 41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-09-17 17:= 18:22 UTC (rev 17640) @@ -15,9 +15,9 @@ OpenSourceAction_canot_find_source_file=3DCan't find source file. OpenSourceAction_canot_open_source_file=3DCan't open source file. OpenSourceAction_open_source_file=3DOpen Source File -ToggleShapeExpandStateAction_toggle_expand_state=3DToggle expand state +ToggleShapeExpandStateAction_toggle_expand_state=3DExpand|Collapse ToggleShapeVisibleStateAction_toggle_visible_state=3DToggle visible state -ToggleConnectionsAction_toggle_connections=3DToggle connections +ToggleConnectionsAction_toggle_connections=3DShow|Hide connections ShapeSetConstraintCommand_move=3Dmove PartFactory_canot_create_part_for_model_element=3DCan't create part for mo= del element: PartFactory_null=3Dnull @@ -29,3 +29,7 @@ DiagramViewer_OutlinePage_Sort_label=3DSort DiagramViewer_OutlinePage_Sort_tooltip=3DSort DiagramViewer_OutlinePage_Sort_description=3DEnable Sorting +ToggleClassMappingAction_class_mappings=3DClass Mappings +TogglePropertyMappingAction_property_mappings=3DProperty Mappings +ToggleAssociationAction_associations=3DAssociations +ToggleForeignKeyConstraintAction_foreign_key_constraints=3DForeign key con= straints Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java 2009-0= 9-17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java 2009-0= 9-17 17:18:22 UTC (rev 17640) @@ -19,6 +19,7 @@ import org.eclipse.gef.ui.actions.ZoomComboContributionItem; import org.eclipse.gef.ui.actions.ZoomInRetargetAction; import org.eclipse.gef.ui.actions.ZoomOutRetargetAction; +import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; @@ -30,9 +31,14 @@ import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ActionMenu; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutActi= on; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleAssociat= ionAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleClassMap= pingAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleConnecti= onsAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.DiagramBaseRet= argetAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleForeignK= eyConstraintAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleProperty= MappingAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeExp= andStateAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeVis= ibleStateAction; import org.jboss.tools.hibernate.ui.view.ImageBundle; @@ -49,28 +55,72 @@ workbenchAction.setToolTipText(DiagramViewerMessages.EditorActionContrib= utor_refresh_visual_mapping); addAction(workbenchAction); // - addRetargetAction(new DiagramBaseRetargetAction( + DiagramBaseRetargetAction diagramAction; + Action[] act; + // + diagramAction =3D new DiagramBaseRetargetAction( AutoLayoutAction.ACTION_ID, = DiagramViewerMessages.AutoLayoutAction_auto_layout, DiagramViewerMessages.AutoLayoutAction_auto_layout, - AutoLayoutAction.img)); + AutoLayoutAction.img); + addRetargetAction(diagramAction); // - addRetargetAction(new DiagramBaseRetargetAction( + DiagramBaseRetargetAction diagramAction1 =3D new DiagramBaseRetargetActi= on( ToggleConnectionsAction.ACTION_ID, = DiagramViewerMessages.ToggleConnectionsAction_toggle_connections, DiagramViewerMessages.ToggleConnectionsAction_toggle_connections, - ToggleConnectionsAction.img)); - addRetargetAction(new DiagramBaseRetargetAction( + ToggleConnectionsAction.img); + addRetargetAction(diagramAction1); + // + DiagramBaseRetargetAction diagramAction2 =3D new DiagramBaseRetargetActi= on( ToggleShapeExpandStateAction.ACTION_ID, = DiagramViewerMessages.ToggleShapeExpandStateAction_toggle_expand_state, DiagramViewerMessages.ToggleShapeExpandStateAction_toggle_expand_state, - ToggleShapeExpandStateAction.img)); - addRetargetAction(new DiagramBaseRetargetAction( + ToggleShapeExpandStateAction.img); + addRetargetAction(diagramAction2); + // + diagramAction =3D new DiagramBaseRetargetAction( ToggleShapeVisibleStateAction.ACTION_ID, = DiagramViewerMessages.ToggleShapeVisibleStateAction_toggle_visible_sta= te, DiagramViewerMessages.ToggleShapeVisibleStateAction_toggle_visible_sta= te, - ToggleShapeVisibleStateAction.img)); + ToggleShapeVisibleStateAction.img); + addRetargetAction(diagramAction); // + diagramAction =3D new DiagramBaseRetargetAction( + ToggleClassMappingAction.ACTION_ID, = + DiagramViewerMessages.ToggleClassMappingAction_class_mappings, + DiagramViewerMessages.ToggleClassMappingAction_class_mappings, + ToggleClassMappingAction.img, IAction.AS_CHECK_BOX); + addRetargetAction(diagramAction); + // + diagramAction =3D new DiagramBaseRetargetAction( + TogglePropertyMappingAction.ACTION_ID, = + DiagramViewerMessages.TogglePropertyMappingAction_property_mappings, + DiagramViewerMessages.TogglePropertyMappingAction_property_mappings, + TogglePropertyMappingAction.img, IAction.AS_CHECK_BOX); + addRetargetAction(diagramAction); + // + diagramAction =3D new DiagramBaseRetargetAction( + ToggleAssociationAction.ACTION_ID, = + DiagramViewerMessages.ToggleAssociationAction_associations, + DiagramViewerMessages.ToggleAssociationAction_associations, + ToggleAssociationAction.img, IAction.AS_CHECK_BOX); + addRetargetAction(diagramAction); + // + diagramAction =3D new DiagramBaseRetargetAction( + ToggleForeignKeyConstraintAction.ACTION_ID, = + DiagramViewerMessages.ToggleForeignKeyConstraintAction_foreign_key_con= straints, + DiagramViewerMessages.ToggleForeignKeyConstraintAction_foreign_key_con= straints, + ToggleForeignKeyConstraintAction.img, IAction.AS_CHECK_BOX); + addRetargetAction(diagramAction); + // + act =3D new Action[4]; + act[0] =3D (Action)getAction(TogglePropertyMappingAction.ACTION_ID); + act[1] =3D (Action)getAction(ToggleClassMappingAction.ACTION_ID); + act[2] =3D (Action)getAction(ToggleAssociationAction.ACTION_ID); + act[3] =3D (Action)getAction(ToggleForeignKeyConstraintAction.ACTION_ID); + diagramAction1.setMenuCreator(new ActionMenu(act)); + // addRetargetAction(new UndoRetargetAction()); addRetargetAction(new RedoRetargetAction()); addRetargetAction(new ZoomInRetargetAction()); @@ -93,10 +143,10 @@ */ public void contributeToToolBar(IToolBarManager tbm) { tbm.add(getAction(ActionFactory.REFRESH.getId())); - tbm.add(new Separator()); = - tbm.add(getAction(ActionFactory.UNDO.getId())); - tbm.add(getAction(ActionFactory.REDO.getId())); - tbm.add(new Separator()); = + tbm.add(new Separator()); + //tbm.add(getAction(ActionFactory.UNDO.getId())); + //tbm.add(getAction(ActionFactory.REDO.getId())); + //tbm.add(new Separator()); //tbm.add(getAction(GEFActionConstants.ZOOM_IN)); //tbm.add(getAction(GEFActionConstants.ZOOM_OUT)); String[] zoomStrings =3D new String[] { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2009-09-= 17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2009-09-= 17 17:18:22 UTC (rev 17640) @@ -44,6 +44,10 @@ import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.PageBook; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutActi= on; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleConnecti= onsAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeExp= andStateAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeVis= ibleStateAction; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram; import org.jboss.tools.hibernate.ui.diagram.editors.parts.TreePartFactory; import org.jboss.tools.hibernate.ui.diagram.editors.popup.PopupMenuProvide= r; @@ -151,6 +155,18 @@ bars.setGlobalActionHandler(id, registry.getAction(id)); id =3D ActionFactory.REDO.getId(); bars.setGlobalActionHandler(id, registry.getAction(id)); + id =3D ActionFactory.REFRESH.getId(); + bars.setGlobalActionHandler(id, registry.getAction(id)); + id =3D ActionFactory.PRINT.getId(); + bars.setGlobalActionHandler(id, registry.getAction(id)); + id =3D AutoLayoutAction.ACTION_ID; + bars.setGlobalActionHandler(id, registry.getAction(id)); + id =3D ToggleConnectionsAction.ACTION_ID; + bars.setGlobalActionHandler(id, registry.getAction(id)); + id =3D ToggleShapeExpandStateAction.ACTION_ID; + bars.setGlobalActionHandler(id, registry.getAction(id)); + id =3D ToggleShapeVisibleStateAction.ACTION_ID; + bars.setGlobalActionHandler(id, registry.getAction(id)); bars.updateActionBars(); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-09-17 16:41:17 = UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-09-17 17:18:22 = UTC (rev 17640) @@ -41,13 +41,13 @@ import org.eclipse.gef.ui.actions.ToggleRulerVisibilityAction; import org.eclipse.gef.ui.actions.ToggleSnapToGeometryAction; import org.eclipse.gef.ui.actions.UndoAction; -import org.eclipse.gef.ui.actions.WorkbenchPartAction; import org.eclipse.gef.ui.actions.ZoomInAction; import org.eclipse.gef.ui.actions.ZoomOutAction; import org.eclipse.gef.ui.parts.GraphicalEditor; import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer; import org.eclipse.gef.ui.parts.TreeViewer; import org.eclipse.gef.ui.rulers.RulerComposite; +import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.util.TransferDropTargetListener; import org.eclipse.swt.SWT; @@ -60,6 +60,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.mapping.RootClass; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ActionMenu; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutActi= on; import org.jboss.tools.hibernate.ui.diagram.editors.actions.CollapseAllAct= ion; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExpandAllActio= n; @@ -67,7 +68,12 @@ import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenMappingAct= ion; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenSourceActi= on; import org.jboss.tools.hibernate.ui.diagram.editors.actions.PrintDiagramVi= ewerAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.RefreshAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleAssociat= ionAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleClassMap= pingAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleConnecti= onsAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleForeignK= eyConstraintAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleProperty= MappingAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeExp= andStateAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeVis= ibleStateAction; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram; @@ -81,7 +87,9 @@ import org.jboss.tools.hibernate.ui.view.ObjectEditorInput; = /** - * @author some modifications from Vitali + * = + * @author ? + * @author Vitali Yemialyanchyk */ public class DiagramViewer extends GraphicalEditor { = @@ -151,21 +159,15 @@ @SuppressWarnings("unchecked") protected void createActions() { = - getEditorSite().getActionBars().setGlobalActionHandler( - ActionFactory.REFRESH.getId(), new WorkbenchPartAction(this) { - - protected boolean calculateEnabled() { - return true; - } - public void run() { - ormDiagram.refresh(); - } - }); - //super.createActions(); // BEGIN: redefine super.createActions ActionRegistry registry =3D getActionRegistry(); IAction action; + + action =3D new RefreshAction(this); + registry.registerAction(action); + getEditorSite().getActionBars().setGlobalActionHandler( + ActionFactory.REFRESH.getId(), action); = action =3D new UndoAction(this); registry.registerAction(action); @@ -206,14 +208,28 @@ action =3D new AutoLayoutAction(this); registry.registerAction(action); = - action =3D new ToggleConnectionsAction(this); + ToggleConnectionsAction actionToggleConnections =3D new ToggleConnection= sAction(this); + registry.registerAction(actionToggleConnections); + = + action =3D new ToggleAssociationAction(this); registry.registerAction(action); = + action =3D new ToggleClassMappingAction(this); + registry.registerAction(action); + = + action =3D new ToggleForeignKeyConstraintAction(this); + registry.registerAction(action); + = + action =3D new TogglePropertyMappingAction(this); + registry.registerAction(action); + = action =3D new ToggleShapeExpandStateAction(this); registry.registerAction(action); + getSelectionActions().add(action.getId()); = action =3D new ToggleShapeVisibleStateAction(this); registry.registerAction(action); + getSelectionActions().add(action.getId()); = action =3D new CollapseAllAction(this); registry.registerAction(action); @@ -227,6 +243,13 @@ action =3D new ZoomOutAction(gefRootEditPart.getZoomManager()); registry.registerAction(action); = + Action[] act =3D new Action[4]; + act[0] =3D (Action)registry.getAction(TogglePropertyMappingAction.ACTION= _ID); + act[1] =3D (Action)registry.getAction(ToggleClassMappingAction.ACTION_ID= ); + act[2] =3D (Action)registry.getAction(ToggleAssociationAction.ACTION_ID); + act[3] =3D (Action)registry.getAction(ToggleForeignKeyConstraintAction.A= CTION_ID); + actionToggleConnections.setMenuCreator(new ActionMenu(act)); + } = private TransferDropTargetListener createTransferDropTargetListener() { @@ -304,6 +327,9 @@ outline.setSelectionSynchronizer(getSelectionSynchronizer()); outline.setOrmDiagram(ormDiagram); outline.setEditor(this); + RefreshAction refreshAction =3D (RefreshAction)getActionRegistry().getA= ction( + ActionFactory.REFRESH.getId()); + refreshAction.setOutlinePage(outline); return outline; } if (type =3D=3D ZoomManager.class) { @@ -480,4 +506,49 @@ } return res; } + = + = + public boolean getConnectionsVisibilityAssociation() { + return getViewerContents().getConnectionsVisibilityAssociation(); + } + = + public void setConnectionsVisibilityAssociation(boolean connectionsVisibi= lityAssociation) { + getViewerContents().setConnectionsVisibilityAssociation(connectionsVisib= ilityAssociation); + ActionRegistry registry =3D getActionRegistry(); + IAction action =3D registry.getAction(ToggleAssociationAction.ACTION_ID); + action.setChecked(connectionsVisibilityAssociation); + } + = + public boolean getConnectionsVisibilityClassMapping() { + return getViewerContents().getConnectionsVisibilityClassMapping(); + } + = + public void setConnectionsVisibilityClassMapping(boolean connectionsVisib= ilityClassMapping) { + getViewerContents().setConnectionsVisibilityClassMapping(connectionsVisi= bilityClassMapping); + ActionRegistry registry =3D getActionRegistry(); + IAction action =3D registry.getAction(ToggleClassMappingAction.ACTION_ID= ); + action.setChecked(connectionsVisibilityClassMapping); + } + = + public boolean getConnectionsVisibilityForeignKeyConstraint() { + return getViewerContents().getConnectionsVisibilityForeignKeyConstraint(= ); + } + = + public void setConnectionsVisibilityForeignKeyConstraint(boolean connecti= onsVisibilityForeignKeyConstraint) { + getViewerContents().setConnectionsVisibilityForeignKeyConstraint(connect= ionsVisibilityForeignKeyConstraint); + ActionRegistry registry =3D getActionRegistry(); + IAction action =3D registry.getAction(ToggleForeignKeyConstraintAction.A= CTION_ID); + action.setChecked(connectionsVisibilityForeignKeyConstraint); + } + = + public boolean getConnectionsVisibilityPropertyMapping() { + return getViewerContents().getConnectionsVisibilityPropertyMapping(); + } + = + public void setConnectionsVisibilityPropertyMapping(boolean connectionsVi= sibilityPropertyMapping) { + getViewerContents().setConnectionsVisibilityPropertyMapping(connectionsV= isibilityPropertyMapping); + ActionRegistry registry =3D getActionRegistry(); + IAction action =3D registry.getAction(TogglePropertyMappingAction.ACTION= _ID); + action.setChecked(connectionsVisibilityPropertyMapping); + } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/ActionMenu.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ActionMenu.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ActionMenu.java 2009-09-17 17:1= 8:22 UTC (rev 17640) @@ -0,0 +1,79 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.ui.diagram.editors.actions; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.ActionContributionItem; +import org.eclipse.jface.action.IMenuCreator; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Menu; + +/** + * Menu with list of actions. + * = + * @author Vitali Yemialyanchyk + */ +public class ActionMenu extends Action implements IMenuCreator { + + private Action[] actions; + private Menu menu; + + public ActionMenu(Action[] actions) { + this.actions =3D actions; + if (this.actions.length > 0) { + setToolTipText(actions[0].getToolTipText()); + setImageDescriptor(actions[0].getImageDescriptor()); + if (actions.length > 1) { + setMenuCreator(this); + } + } + } + + public void run() { + if (actions.length > 0) { + actions[0].run(); + } + } + + public void dispose() { + if (menu !=3D null) { + menu.dispose(); + menu =3D null; + } + } + + public Menu getMenu(Control parent) { + if (menu !=3D null) { + menu.dispose(); + } + menu =3D new Menu(parent); + for (int i =3D 0; i < actions.length; i++) { + addActionToMenu(menu, actions[i]); + } + return menu; + } + + public Menu getMenu(Menu parent) { + if (menu !=3D null) { + menu.dispose(); + } + menu =3D new Menu(parent); + for (int i =3D 0; i < actions.length; i++) { + addActionToMenu(menu, actions[i]); + } + return menu; + } + + protected void addActionToMenu(Menu parent, Action action) { + ActionContributionItem item =3D new ActionContributionItem(action); + item.fill(parent, -1); + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-09-= 17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-09-= 17 17:18:22 UTC (rev 17640) @@ -27,6 +27,11 @@ public DiagramBaseAction(DiagramViewer editor) { this.editor =3D editor; } + = + public DiagramBaseAction(DiagramViewer editor, int style) { + super(null, style); + this.editor =3D editor; + } = protected DiagramViewer getDiagramViewer() { DiagramViewer res =3D editor; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction.java = 2009-09-17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction.java = 2009-09-17 17:18:22 UTC (rev 17640) @@ -24,5 +24,13 @@ setToolTipText(toolTipText); setImageDescriptor(imgDescriptor); } + = + public DiagramBaseRetargetAction(final String actionId, final String text, + final String toolTipText, final ImageDescriptor imgDescriptor, + int style) { + super(actionId, text, style); + setToolTipText(toolTipText); + setImageDescriptor(imgDescriptor); + } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-09-= 17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-09-= 17 17:18:22 UTC (rev 17640) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2007-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, @@ -16,11 +16,9 @@ = import org.eclipse.core.runtime.CoreException; import org.eclipse.gef.ui.actions.SelectionAction; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.mapping.Column; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-09-1= 7 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-09-1= 7 17:18:22 UTC (rev 17640) @@ -16,11 +16,9 @@ = import org.eclipse.core.runtime.CoreException; import org.eclipse.gef.ui.actions.SelectionAction; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.mapping.Column; Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/RefreshAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/RefreshAction.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/RefreshAction.java 2009-09-17 1= 7:18:22 UTC (rev 17640) @@ -0,0 +1,54 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.ui.diagram.editors.actions; + +import org.eclipse.gef.ui.actions.WorkbenchPartAction; +import org.eclipse.ui.actions.ActionFactory; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramContentOutlineP= age; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; + +/** + * Refresh diagram action + * = + * @author Vitali Yemialyanchyk + */ +public class RefreshAction extends WorkbenchPartAction { + + public static final String ACTION_ID =3D ActionFactory.REFRESH.getId(); + = + protected DiagramContentOutlinePage outline =3D null; + + public RefreshAction(DiagramViewer editor) { + super(editor); + setId(ACTION_ID); + } + = + protected DiagramViewer getDiagramViewer() { + return (DiagramViewer)getWorkbenchPart(); + } + + public void run() { + getDiagramViewer().getViewerContents().refresh(); + if (outline !=3D null) { + // synchronize contents of outline page + outline.setContents(outline.getOrmDiagram()); + } + } + + @Override + protected boolean calculateEnabled() { + return true; + } + = + public void setOutlinePage(DiagramContentOutlinePage outline) { + this.outline =3D outline; + } +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/ToggleAssociationAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleAssociationAction.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleAssociationAction.java 20= 09-09-17 17:18:22 UTC (rev 17640) @@ -0,0 +1,42 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.ui.diagram.editors.actions; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; + +/** + * Show|Hide connections which type is "Associations" (class associations). + * = + * @author Vitali Yemialyanchyk + */ +public class ToggleAssociationAction extends DiagramBaseAction { + + public static final String ACTION_ID =3D "toggleAssociationId"; //$NON-NL= S-1$ + public static final ImageDescriptor img =3D = + ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleassocia= tion.png"); //$NON-NLS-1$ + + public ToggleAssociationAction(DiagramViewer editor) { + super(editor); + setId(ACTION_ID); + setText(DiagramViewerMessages.ToggleAssociationAction_associations); + setToolTipText(DiagramViewerMessages.ToggleAssociationAction_association= s); + setImageDescriptor(img); + boolean state =3D getDiagramViewer().getConnectionsVisibilityAssociation= (); + setChecked(state); + } + + public void run() { + boolean state =3D getDiagramViewer().getConnectionsVisibilityAssociation= (); + getDiagramViewer().setConnectionsVisibilityAssociation(!state); + } +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/ToggleClassMappingAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleClassMappingAction.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleClassMappingAction.java 2= 009-09-17 17:18:22 UTC (rev 17640) @@ -0,0 +1,42 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.ui.diagram.editors.actions; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; + +/** + * Show|Hide connections which type is "Class Mappings" (class->table). + * = + * @author Vitali Yemialyanchyk + */ +public class ToggleClassMappingAction extends DiagramBaseAction { + + public static final String ACTION_ID =3D "toggleClassMappingId"; //$NON-N= LS-1$ + public static final ImageDescriptor img =3D = + ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleclassma= pping.png"); //$NON-NLS-1$ + + public ToggleClassMappingAction(DiagramViewer editor) { + super(editor); + setId(ACTION_ID); + setText(DiagramViewerMessages.ToggleClassMappingAction_class_mappings); + setToolTipText(DiagramViewerMessages.ToggleClassMappingAction_class_mapp= ings); + setImageDescriptor(img); + boolean state =3D getDiagramViewer().getConnectionsVisibilityClassMappin= g(); + setChecked(state); + } + + public void run() { + boolean state =3D getDiagramViewer().getConnectionsVisibilityClassMappin= g(); + getDiagramViewer().setConnectionsVisibilityClassMapping(!state); + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java 20= 09-09-17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java 20= 09-09-17 17:18:22 UTC (rev 17640) @@ -15,6 +15,8 @@ import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; = /** + * Show|Hide all connections. + * = * @author Vitali Yemialyanchyk */ public class ToggleConnectionsAction extends DiagramBaseAction { @@ -24,7 +26,7 @@ ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleconnect= ions.png"); //$NON-NLS-1$ = public ToggleConnectionsAction(DiagramViewer editor) { - super(editor); + super(editor, AS_DROP_DOWN_MENU); setId(ACTION_ID); setText(DiagramViewerMessages.ToggleConnectionsAction_toggle_connections= ); setToolTipText(DiagramViewerMessages.ToggleConnectionsAction_toggle_conn= ections); @@ -32,6 +34,13 @@ } = public void run() { - getDiagramViewer().getViewerContents().toggleConnections(); + boolean state =3D getDiagramViewer().getConnectionsVisibilityAssociation= (); + getDiagramViewer().setConnectionsVisibilityAssociation(!state); + state =3D getDiagramViewer().getConnectionsVisibilityClassMapping(); + getDiagramViewer().setConnectionsVisibilityClassMapping(!state); + state =3D getDiagramViewer().getConnectionsVisibilityForeignKeyConstrain= t(); + getDiagramViewer().setConnectionsVisibilityForeignKeyConstraint(!state); + state =3D getDiagramViewer().getConnectionsVisibilityPropertyMapping(); + getDiagramViewer().setConnectionsVisibilityPropertyMapping(!state); } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/ToggleForeignKeyConstraintAc= tion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleForeignKeyConstraintActio= n.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleForeignKeyConstraintActio= n.java 2009-09-17 17:18:22 UTC (rev 17640) @@ -0,0 +1,43 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.ui.diagram.editors.actions; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; + +/** + * Show|Hide connections which type is "Foreign key constraints" = + * (foreign keys which associations are based on). + * = + * @author Vitali Yemialyanchyk + */ +public class ToggleForeignKeyConstraintAction extends DiagramBaseAction { + + public static final String ACTION_ID =3D "toggleForeignKeyConstraintId"; = //$NON-NLS-1$ + public static final ImageDescriptor img =3D = + ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleforeign= keyconstraint.png"); //$NON-NLS-1$ + + public ToggleForeignKeyConstraintAction(DiagramViewer editor) { + super(editor); + setId(ACTION_ID); + setText(DiagramViewerMessages.ToggleForeignKeyConstraintAction_foreign_k= ey_constraints); + setToolTipText(DiagramViewerMessages.ToggleForeignKeyConstraintAction_fo= reign_key_constraints); + setImageDescriptor(img); + boolean state =3D getDiagramViewer().getConnectionsVisibilityForeignKeyC= onstraint(); + setChecked(state); + } + + public void run() { + boolean state =3D getDiagramViewer().getConnectionsVisibilityForeignKeyC= onstraint(); + getDiagramViewer().setConnectionsVisibilityForeignKeyConstraint(!state); + } +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/TogglePropertyMappingAction.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/TogglePropertyMappingAction.jav= a (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/TogglePropertyMappingAction.jav= a 2009-09-17 17:18:22 UTC (rev 17640) @@ -0,0 +1,42 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.ui.diagram.editors.actions; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; + +/** + * Show|Hide connections which type is "Property Mappings" (property->colu= mn). + * = + * @author Vitali Yemialyanchyk + */ +public class TogglePropertyMappingAction extends DiagramBaseAction { + + public static final String ACTION_ID =3D "togglePropertyMappingId"; //$NO= N-NLS-1$ + public static final ImageDescriptor img =3D = + ImageDescriptor.createFromFile(DiagramViewer.class, "icons/togglepropert= ymapping.png"); //$NON-NLS-1$ + + public TogglePropertyMappingAction(DiagramViewer editor) { + super(editor); + setId(ACTION_ID); + setText(DiagramViewerMessages.TogglePropertyMappingAction_property_mappi= ngs); + setToolTipText(DiagramViewerMessages.TogglePropertyMappingAction_propert= y_mappings); + setImageDescriptor(img); + boolean state =3D getDiagramViewer().getConnectionsVisibilityPropertyMap= ping(); + setChecked(state); + } + + public void run() { + boolean state =3D getDiagramViewer().getConnectionsVisibilityPropertyMap= ping(); + getDiagramViewer().setConnectionsVisibilityPropertyMapping(!state); + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAct= ion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.ja= va 2009-09-17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.ja= va 2009-09-17 17:18:22 UTC (rev 17640) @@ -15,10 +15,9 @@ import java.util.List; = import org.eclipse.gef.editparts.AbstractTreeEditPart; +import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IWorkbenchPart; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.model.ExpandableShape; @@ -29,13 +28,13 @@ * = * @author Vitali Yemialyanchyk */ -public class ToggleShapeExpandStateAction extends DiagramBaseAction { +public class ToggleShapeExpandStateAction extends SelectionAction { = public static final String ACTION_ID =3D "toggleShapeExpandStateId"; //$N= ON-NLS-1$ public static final ImageDescriptor img =3D = - ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleshapeex= pandstate.png"); //$NON-NLS-1$ + ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleshapeex= pandstate2.png"); //$NON-NLS-1$ = - public ToggleShapeExpandStateAction(DiagramViewer editor) { + public ToggleShapeExpandStateAction(IWorkbenchPart editor) { super(editor); setId(ACTION_ID); setText(DiagramViewerMessages.ToggleShapeExpandStateAction_toggle_expand= _state); @@ -45,29 +44,52 @@ = @SuppressWarnings("unchecked") public void run() { - ISelection selection =3D getDiagramViewer().getEditPartViewer().getSelec= tion(); - if (!(selection instanceof StructuredSelection)) { + if (getSelectedObjects().isEmpty()) { return; } List selectedShape =3D new ArrayList(); - IStructuredSelection structedSelection =3D (IStructuredSelection)selecti= on; - if (structedSelection !=3D null) { - Iterator it =3D structedSelection.iterator(); - while (it.hasNext()) { - Object firstElement =3D it.next(); - Object obj =3D null; - if (firstElement instanceof OrmEditPart) { - obj =3D ((OrmEditPart)firstElement).getModel(); - } else if (firstElement instanceof AbstractTreeEditPart) { - obj =3D ((AbstractTreeEditPart)firstElement).getModel(); - } - if (null !=3D obj && obj instanceof ExpandableShape) { - selectedShape.add((ExpandableShape)obj); - } = + Iterator it =3D getSelectedObjects().iterator(); + while (it.hasNext()) { + Object firstElement =3D it.next(); + Object obj =3D null; + if (firstElement instanceof OrmEditPart) { + obj =3D ((OrmEditPart)firstElement).getModel(); + } else if (firstElement instanceof AbstractTreeEditPart) { + obj =3D ((AbstractTreeEditPart)firstElement).getModel(); } + if (null !=3D obj && obj instanceof ExpandableShape) { + selectedShape.add((ExpandableShape)obj); + } = } for (ExpandableShape shape : selectedShape) { shape.setExpanded(!shape.isExpanded()); } } + + @Override + protected boolean calculateEnabled() { + return canPerformAction(); + } + + @SuppressWarnings("unchecked") + private boolean canPerformAction() { + boolean res =3D false; + if (getSelectedObjects().isEmpty()) { + return res; + } + Iterator it =3D getSelectedObjects().iterator(); + while (it.hasNext() && !res) { + Object firstElement =3D it.next(); + Object obj =3D null; + if (firstElement instanceof OrmEditPart) { + obj =3D ((OrmEditPart)firstElement).getModel(); + } else if (firstElement instanceof AbstractTreeEditPart) { + obj =3D ((AbstractTreeEditPart)firstElement).getModel(); + } + if (null !=3D obj && obj instanceof ExpandableShape) { + res =3D true; + } = + } + return res; + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAc= tion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.j= ava 2009-09-17 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.j= ava 2009-09-17 17:18:22 UTC (rev 17640) @@ -15,10 +15,9 @@ import java.util.List; = import org.eclipse.gef.editparts.AbstractTreeEditPart; +import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IWorkbenchPart; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; @@ -31,13 +30,13 @@ * = * @author Vitali Yemialyanchyk */ -public class ToggleShapeVisibleStateAction extends DiagramBaseAction { +public class ToggleShapeVisibleStateAction extends SelectionAction { = public static final String ACTION_ID =3D "toggleShapeVisibleStateId"; //$= NON-NLS-1$ public static final ImageDescriptor img =3D = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleshapevi= siblestate.png"); //$NON-NLS-1$ = - public ToggleShapeVisibleStateAction(DiagramViewer editor) { + public ToggleShapeVisibleStateAction(IWorkbenchPart editor) { super(editor); setId(ACTION_ID); setText(DiagramViewerMessages.ToggleShapeVisibleStateAction_toggle_visib= le_state); @@ -47,26 +46,22 @@ = @SuppressWarnings("unchecked") public void run() { - ISelection selection =3D getDiagramViewer().getEditPartViewer().getSelec= tion(); - if (!(selection instanceof StructuredSelection)) { + if (getSelectedObjects().isEmpty()) { return; } List selectedShape =3D new ArrayList(); - IStructuredSelection structedSelection =3D (IStructuredSelection)selecti= on; - if (structedSelection !=3D null) { - Iterator it =3D structedSelection.iterator(); - while (it.hasNext()) { - Object firstElement =3D it.next(); - Object obj =3D null; - if (firstElement instanceof OrmEditPart) { - obj =3D ((OrmEditPart)firstElement).getModel(); - } else if (firstElement instanceof AbstractTreeEditPart) { - obj =3D ((AbstractTreeEditPart)firstElement).getModel(); - } - if (null !=3D obj && obj instanceof OrmShape) { - selectedShape.add((OrmShape)obj); - } = + Iterator it =3D getSelectedObjects().iterator(); + while (it.hasNext()) { + Object firstElement =3D it.next(); + Object obj =3D null; + if (firstElement instanceof OrmEditPart) { + obj =3D ((OrmEditPart)firstElement).getModel(); + } else if (firstElement instanceof AbstractTreeEditPart) { + obj =3D ((AbstractTreeEditPart)firstElement).getModel(); } + if (null !=3D obj && obj instanceof OrmShape) { + selectedShape.add((OrmShape)obj); + } = } for (OrmShape shape : selectedShape) { Object ormElement =3D shape.getOrmElement(); @@ -75,4 +70,34 @@ } } } + + @Override + protected boolean calculateEnabled() { + return canPerformAction(); + } + + @SuppressWarnings("unchecked") + private boolean canPerformAction() { + boolean res =3D false; + if (getSelectedObjects().isEmpty()) { + return res; + } + Iterator it =3D getSelectedObjects().iterator(); + while (it.hasNext() && !res) { + Object firstElement =3D it.next(); + Object obj =3D null; + if (firstElement instanceof OrmEditPart) { + obj =3D ((OrmEditPart)firstElement).getModel(); + } else if (firstElement instanceof AbstractTreeEditPart) { + obj =3D ((AbstractTreeEditPart)firstElement).getModel(); + } + if (null !=3D obj && obj instanceof OrmShape) { + Object ormElement =3D ((OrmShape)obj).getOrmElement(); + if (ormElement instanceof PersistentClass || ormElement instanceof Tab= le) { + res =3D true; + } + } = + } + return res; + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/icons/autolayout.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/icons/toggleassociation.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .ui/src/org/jboss/tools/hibernate/ui/diagram/editors/icons/toggleassociatio= n.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/icons/toggleclassmapping.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .ui/src/org/jboss/tools/hibernate/ui/diagram/editors/icons/toggleclassmappi= ng.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/icons/toggleconnections.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/icons/toggleforeignkeyconstraint.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .ui/src/org/jboss/tools/hibernate/ui/diagram/editors/icons/toggleforeignkey= constraint.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/icons/togglepropertymapping.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .ui/src/org/jboss/tools/hibernate/ui/diagram/editors/icons/togglepropertyma= pping.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/icons/toggleshapeexpandstate.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jb= oss/tools/hibernate/ui/diagram/editors/icons/toggleshapeexpandstate2.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .ui/src/org/jboss/tools/hibernate/ui/diagram/editors/icons/toggleshapeexpan= dstate2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/icons/toggleshapevisiblestate.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/model/Connection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/model/Connection.java 2009-09-17 16:41:= 17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/model/Connection.java 2009-09-17 17:18:= 22 UTC (rev 17640) @@ -13,12 +13,20 @@ /** * Directed connection between 2 shapes, from source to target. = * - * @author some modifications from Vitali + * @author ? + * @author Vitali Yemialyanchyk */ public class Connection extends BaseElement { = protected Shape source; protected Shape target; + = + public enum ConnectionType { + ClassMapping, + PropertyMapping, + Association, + ForeignKeyConstraint, + }; = /** * flag to prevent cycle call of updateVisibleValue() @@ -42,6 +50,20 @@ public Shape getTarget() { return target; } + = + public ConnectionType getConnectionType() { + if ((source instanceof OrmShape) && (target instanceof OrmShape)) { + return ConnectionType.ClassMapping; + } + if ((source instanceof OrmShape) || (target instanceof OrmShape)) { + return ConnectionType.Association; + } + // TODO: what is ForeignKeyConstraint? + //if ( ??? ) { + // return ConnectionType.ForeignKeyConstraint; + //} + return ConnectionType.PropertyMapping; + } = /** * It has no children, so not possible to add. Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-09-17 16:41:= 17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-09-17 17:18:= 22 UTC (rev 17640) @@ -39,6 +39,7 @@ import org.hibernate.eclipse.console.utils.ProjectUtils; import org.hibernate.mapping.RootClass; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; +import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection.Conne= ctionType; import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramRuler; import org.jboss.tools.hibernate.ui.view.OrmLabelProvider; = @@ -62,7 +63,10 @@ private HashMap elements =3D new HashMap(); private RootClass[] ormElements; private String[] entityNames; - private boolean connectionsVisibility =3D true; + private boolean connectionsVisibilityClassMapping =3D true; + private boolean connectionsVisibilityPropertyMapping =3D true; + private boolean connectionsVisibilityAssociation =3D true; + private boolean connectionsVisibilityForeignKeyConstraint =3D true; private ArrayList connections =3D new ArrayList(); = // editor elements settings @@ -315,27 +319,74 @@ firePropertyChange(AUTOLAYOUT, null, null); } = - public boolean getConnectionsVisibility() { - return connectionsVisibility; + public boolean getConnectionsVisibilityAssociation() { + return connectionsVisibilityAssociation; } = - public void setConnectionsVisibility(boolean connectionsVisibility) { - if (this.connectionsVisibility =3D=3D connectionsVisibility) { + public void setConnectionsVisibilityAssociation(boolean connectionsVisibi= lityAssociation) { + if (this.connectionsVisibilityAssociation =3D=3D connectionsVisibilityAs= sociation) { return; } - this.connectionsVisibility =3D connectionsVisibility; + this.connectionsVisibilityAssociation =3D connectionsVisibilityAssociati= on; for (Connection connection : connections) { - if (!(connection.getSource() instanceof OrmShape) || - !(connection.getTarget() instanceof OrmShape)) { - connection.setVisible(connectionsVisibility); + ConnectionType ct =3D connection.getConnectionType(); + if (ct =3D=3D ConnectionType.Association) { + connection.setVisible(connectionsVisibilityAssociation); } } } = - public void toggleConnections() { - setConnectionsVisibility(!getConnectionsVisibility()); + public boolean getConnectionsVisibilityClassMapping() { + return connectionsVisibilityClassMapping; } = + public void setConnectionsVisibilityClassMapping(boolean connectionsVisib= ilityClassMapping) { + if (this.connectionsVisibilityClassMapping =3D=3D connectionsVisibilityC= lassMapping) { + return; + } + this.connectionsVisibilityClassMapping =3D connectionsVisibilityClassMap= ping; + for (Connection connection : connections) { + ConnectionType ct =3D connection.getConnectionType(); + if (ct =3D=3D ConnectionType.ClassMapping) { + connection.setVisible(connectionsVisibilityClassMapping); + } + } + } + = + public boolean getConnectionsVisibilityForeignKeyConstraint() { + return connectionsVisibilityForeignKeyConstraint; + } + = + public void setConnectionsVisibilityForeignKeyConstraint(boolean connecti= onsVisibilityForeignKeyConstraint) { + if (this.connectionsVisibilityForeignKeyConstraint =3D=3D connectionsVis= ibilityForeignKeyConstraint) { + return; + } + this.connectionsVisibilityForeignKeyConstraint =3D connectionsVisibility= ForeignKeyConstraint; + for (Connection connection : connections) { + ConnectionType ct =3D connection.getConnectionType(); + if (ct =3D=3D ConnectionType.ForeignKeyConstraint) { + connection.setVisible(connectionsVisibilityForeignKeyConstraint); + } + } + } + = + public boolean getConnectionsVisibilityPropertyMapping() { + return connectionsVisibilityPropertyMapping; + } + = + public void setConnectionsVisibilityPropertyMapping(boolean connectionsVi= sibilityPropertyMapping) { + if (this.connectionsVisibilityPropertyMapping =3D=3D connectionsVisibili= tyPropertyMapping) { + return; + } + this.connectionsVisibilityPropertyMapping =3D connectionsVisibilityPrope= rtyMapping; + for (Connection connection : connections) { + ConnectionType ct =3D connection.getConnectionType(); + if (ct =3D=3D ConnectionType.PropertyMapping) { + connection.setVisible(connectionsVisibilityPropertyMapping); + } + } + } + = @Override protected void loadFromProperties(Properties properties) { super.loadFromProperties(properties); @@ -349,6 +400,14 @@ zoom =3D Double.valueOf(str).doubleValue(); str =3D properties.getProperty("deepIntoSort", "false"); //$NON-NLS-1$ /= /$NON-NLS-2$ deepIntoSort =3D Boolean.valueOf(str).booleanValue(); + str =3D properties.getProperty("connectionsVisibilityAssociation", "true= "); //$NON-NLS-1$ //$NON-NLS-2$ + connectionsVisibilityAssociation =3D Boolean.valueOf(str).booleanValue(); + str =3D properties.getProperty("connectionsVisibilityClassMapping", "tru= e"); //$NON-NLS-1$ //$NON-NLS-2$ + connectionsVisibilityClassMapping =3D Boolean.valueOf(str).booleanValue(= ); + str =3D properties.getProperty("connectionsVisibilityForeignKeyConstrain= t", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + connectionsVisibilityForeignKeyConstraint =3D Boolean.valueOf(str).boole= anValue(); + str =3D properties.getProperty("connectionsVisibilityPropertyMapping", "= true"); //$NON-NLS-1$ //$NON-NLS-2$ + connectionsVisibilityPropertyMapping =3D Boolean.valueOf(str).booleanVal= ue(); } = @Override @@ -358,6 +417,10 @@ properties.put("gridEnabled", "" + gridEnabled); //$NON-NLS-1$ //$NON-NL= S-2$ properties.put("zoom", "" + zoom); //$NON-NLS-1$ //$NON-NLS-2$ properties.put("deepIntoSort", "" + deepIntoSort); //$NON-NLS-1$ //$NON-= NLS-2$ + properties.put("connectionsVisibilityAssociation", "" + connectionsVisib= ilityAssociation); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("connectionsVisibilityClassMapping", "" + connectionsVisi= bilityClassMapping); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("connectionsVisibilityForeignKeyConstraint", "" + connect= ionsVisibilityForeignKeyConstraint); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("connectionsVisibilityPropertyMapping", "" + connectionsV= isibilityPropertyMapping); //$NON-NLS-1$ //$NON-NLS-2$ super.saveInProperties(properties); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/model/Shape.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/model/Shape.java 2009-09-17 16:41:17 UT= C (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/model/Shape.java 2009-09-17 17:18:22 UT= C (rev 17640) @@ -20,6 +20,7 @@ import org.hibernate.mapping.Component; import org.hibernate.mapping.Property; import org.hibernate.mapping.Value; +import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection.Conne= ctionType; import org.jboss.tools.hibernate.ui.view.HibernateUtils; = /** @@ -171,10 +172,42 @@ super.updateVisibleValue(initState); // update connections visibility state for (Connection connection : sourceConnections) { - connection.updateVisibleValue(getOrmDiagram().getConnectionsVisibility(= )); + boolean state =3D true; + ConnectionType ct =3D connection.getConnectionType(); + switch (ct) { + case ClassMapping: + state =3D getOrmDiagram().getConnectionsVisibilityClassMapping(); + break; + case PropertyMapping: + state =3D getOrmDiagram().getConnectionsVisibilityPropertyMapping(); + break; + case Association: + state =3D getOrmDiagram().getConnectionsVisibilityAssociation(); + break; + case ForeignKeyConstraint: + state =3D getOrmDiagram().getConnectionsVisibilityForeignKeyConstraint= (); + break; + } + connection.updateVisibleValue(state); } for (Connection connection : targetConnections) { - connection.updateVisibleValue(getOrmDiagram().getConnectionsVisibility(= )); + boolean state =3D true; + ConnectionType ct =3D connection.getConnectionType(); + switch (ct) { + case ClassMapping: + state =3D getOrmDiagram().getConnectionsVisibilityClassMapping(); + break; + case PropertyMapping: + state =3D getOrmDiagram().getConnectionsVisibilityPropertyMapping(); + break; + case Association: + state =3D getOrmDiagram().getConnectionsVisibilityAssociation(); + break; + case ForeignKeyConstraint: + state =3D getOrmDiagram().getConnectionsVisibilityForeignKeyConstraint= (); + break; + } + connection.updateVisibleValue(state); } } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2009-09-17= 16:41:17 UTC (rev 17639) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2009-09-17= 17:18:22 UTC (rev 17640) @@ -1,12 +1,12 @@ /*************************************************************************= ****** - * Copyright (c) 2007-2009 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007-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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + * Contributor: + * Red Hat, Inc. - initial API and implementation *************************************************************************= *****/ package org.jboss.tools.hibernate.ui.diagram.editors.popup; = @@ -41,13 +41,16 @@ import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleConnecti= onsAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeExp= andStateAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeVis= ibleStateAction; +import org.jboss.tools.hibernate.ui.diagram.editors.model.ExpandableShape; +import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape; import org.jboss.tools.hibernate.ui.diagram.editors.parts.OrmEditPart; = /** * Context menu provider for Diagram Viewer and Diagram Outline. * = - * @author some modifications from Vitali + * @author ? + * @author Vitali Yemialyanchyk */ public class PopupMenuProvider extends ContextMenuProvider { private ActionRegistry actionRegistry; @@ -94,9 +97,10 @@ createMenuItem(getMenu(), action); = } } - boolean addToggleMenu =3D false; + boolean addToggleVisibleStateMenu =3D false; + boolean addToggleExpandStateMenu =3D false; Iterator it =3D selection.iterator(); - while (it.hasNext() && !addToggleMenu) { + while (it.hasNext() && (!addToggleVisibleStateMenu || !addToggleExpa= ndStateMenu)) { Object element =3D it.next(); Object obj =3D null; if (element instanceof OrmEditPart) { @@ -104,19 +108,23 @@ } else if (element instanceof AbstractTreeEditPart) { obj =3D ((AbstractTreeEditPart)element).getModel(); } - if (null !=3D obj && obj instanceof Shape) { + if (null !=3D obj && obj instanceof OrmShape) { selectedShape =3D (Shape)obj; Object first =3D selectedShape.getOrmElement(); if (first instanceof PersistentClass || first instanceof Table) { - addToggleMenu =3D true; + addToggleVisibleStateMenu =3D true; } + } + if (null !=3D obj && obj instanceof ExpandableShape) { + addToggleExpandStateMenu =3D true; } = } - if (addToggleMenu) { + if (addToggleVisibleStateMenu) { action =3D getActionRegistry().getAction(ToggleShapeVisibleStateAction= .ACTION_ID); appendToGroup(GEFActionConstants.GROUP_EDIT, action); createMenuItem(getMenu(), action); - + } + if (addToggleExpandStateMenu) { action =3D getActionRegistry().getAction(ToggleShapeExpandStateAction.= ACTION_ID); appendToGroup(GEFActionConstants.GROUP_EDIT, action); createMenuItem(getMenu(), action); --===============2263554751601794299==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 13:47:25 2009 Content-Type: multipart/mixed; boundary="===============5036844789712326165==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17641 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring. Date: Thu, 17 Sep 2009 13:47:25 -0400 Message-ID: <200909171747.n8HHlPip003324@svn01.web.mwc.hst.phx2.redhat.com> --===============5036844789712326165== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-17 13:47:25 -0400 (Thu, 17 Sep 2009) New Revision: 17641 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRefactorSearcher.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRefactorSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-17 17:18:22 UTC = (rev 17640) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-17 17:47:25 UTC = (rev 17641) @@ -376,17 +376,12 @@ = SimpleELContext context =3D new SimpleELContext(); = - ElVarSearcher elSearcher =3D new ElVarSearcher((ELCompletionEngine)reso= lver); - = - List vars =3D elSearcher.findAllVars(file, offset); - = - if(vars =3D=3D null) - continue; - = - context.setVars(vars); context.setResource(file); context.setElResolvers(resolvers); - = + + List vars =3D ElVarSearcher.findAllVars(context, offset, resolver); + context.setVars(vars); + ELResolution resolution =3D resolver.resolve(context, operand); = if(resolution =3D=3D null) @@ -407,4 +402,4 @@ } } } -} +} \ No newline at end of file --===============5036844789712326165==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 17:47:15 2009 Content-Type: multipart/mixed; boundary="===============8087870931419854158==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17642 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: src/org/jboss/tools/jst/web/kb/el and 1 other directory. Date: Thu, 17 Sep 2009 17:47:15 -0400 Message-ID: <200909172147.n8HLlFFG024894@svn01.web.mwc.hst.phx2.redhat.com> --===============8087870931419854158== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-17 17:47:15 -0400 (Thu, 17 Sep 2009) New Revision: 17642 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/el/AbstractELCompletionEngine.java Log: JBIDE-512 context variable code completion dropdown should show their "sour= ce" JBIDE-2541 Show java-doc for EL content assist item The values of type, sourceType and JavaDoc are gathered to be displayed in = CA The JavaDoc comments are shown even from classes stored in JavaSource folde= rs Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-= 09-17 17:47:25 UTC (rev 17641) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-= 09-17 21:47:15 UTC (rev 17642) @@ -12,7 +12,8 @@ org.jboss.tools.common.el.core, org.eclipse.jface.text, org.eclipse.wst.sse.core, - org.eclipse.wst.xml.ui;bundle-version=3D"1.1.0" + org.eclipse.wst.xml.ui;bundle-version=3D"1.1.0", + org.eclipse.jdt.ui;bundle-version=3D"3.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/el/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-17 17:47:25 UTC (rev 17641) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-17 21:47:15 UTC (rev 17642) @@ -17,9 +17,11 @@ = import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; +import org.eclipse.jdt.internal.ui.text.java.ProposalInfo; import org.eclipse.jface.text.BadLocationException; import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.el.core.model.ELArgumentInvocation; @@ -109,6 +111,14 @@ return resolution; } = + /** + * Resolves EL Operand + * = + * @param operand + * @param context + * @param returnEqualedVariablesOnly + * @return + */ public ELResolution resolveELOperand(ELExpression operand, ELContext cont= ext, boolean returnEqualedVariablesOnly) { List vars =3D new ArrayList(); Var[] array =3D context.getVars(); @@ -282,14 +292,8 @@ } = IJavaElement element =3D memberInfo =3D=3D null ? null : memberInfo.g= etJavaElement(); - String attachedJavaDoc =3D null; + String attachedJavaDoc =3D (element instanceof IMember)?(new Proposal= Info((IMember)element)).getInfo(null):null; = - try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); - } catch (JavaModelException e) { - WebKbPlugin.getDefault().logError(e); - } - String varNameProposal =3D v.getName().substring(prefix.length()); TextProposal proposal =3D new TextProposal(); proposal.setLabel(v.getName()); @@ -406,14 +410,8 @@ typeName =3D Signature.getSimpleName(typeName); = IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); - String attachedJavaDoc =3D null; + String attachedJavaDoc =3D (element instanceof IMember)?(new Proposal= Info((IMember)element)).getInfo(null):null; = - try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); - } catch (JavaModelException e) { - WebKbPlugin.getDefault().logError(e); - } - TextProposal proposal =3D new TextProposal(); proposal.setLabel(varName); proposal.setReplacementString(varName.substring(operand.getLength())); @@ -460,14 +458,8 @@ if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaEle= ment(); - String attachedJavaDoc =3D null; - - try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttachedJ= avadoc(null); - } catch (JavaModelException e) { - WebKbPlugin.getDefault().logError(e); - } - + String attachedJavaDoc =3D (element instanceof IMember)?(new ProposalI= nfo((IMember)element)).getInfo(null):null; + = String varName =3D var.getName(); if(operand.getLength()<=3DvarName.length()) { TextProposal proposal =3D new TextProposal(); @@ -685,14 +677,8 @@ if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaE= lement(); - String attachedJavaDoc =3D null; + String attachedJavaDoc =3D (element instanceof IMember)?(new Proposa= lInfo((IMember)element)).getInfo(null):null; = - try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); - } catch (JavaModelException e) { - WebKbPlugin.getDefault().logError(e); - } - TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(presentationString); proposal.setLabel(presentationString); @@ -733,14 +719,8 @@ if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaE= lement(); - String attachedJavaDoc =3D null; + String attachedJavaDoc =3D (element instanceof IMember)?(new Proposa= lInfo((IMember)element)).getInfo(null):null; = - try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttache= dJavadoc(null); - } catch (JavaModelException e) { - WebKbPlugin.getDefault().logError(e); - } - TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(presentationString); proposal.setLabel(presentationString); @@ -815,13 +795,7 @@ if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); - String attachedJavaDoc =3D null; - = - try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); - } catch (JavaModelException e) { - WebKbPlugin.getDefault().logError(e); - } + String attachedJavaDoc =3D (element instanceof IMember)?(new Proposal= Info((IMember)element)).getInfo(null):null; = TextProposal kbProposal =3D new TextProposal(); kbProposal.setReplacementString(proposal.getPresentation().substring(= filter.length())); @@ -910,14 +884,8 @@ if (typeName !=3D null && typeName.indexOf('.') !=3D -1) = typeName =3D Signature.getSimpleName(typeName); IJavaElement element =3D member =3D=3D null ? null : member.getJavaEl= ement(); - String attachedJavaDoc =3D null; + String attachedJavaDoc =3D (element instanceof IMember)?(new Proposal= Info((IMember)element)).getInfo(null):null; = - try { - attachedJavaDoc =3D element =3D=3D null ? null : element.getAttached= Javadoc(null); - } catch (JavaModelException e) { - WebKbPlugin.getDefault().logError(e); - } - TextProposal kbProposal =3D new TextProposal(); = String replacementString =3D proposal.getPresentation().substring(fil= ter.length()); --===============8087870931419854158==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 18:40:06 2009 Content-Type: multipart/mixed; boundary="===============4286809847877945188==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17643 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el and 1 other directory. Date: Thu, 17 Sep 2009 18:40:06 -0400 Message-ID: <200909172240.n8HMe6RW004617@svn01.web.mwc.hst.phx2.redhat.com> --===============4286809847877945188== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-17 18:40:05 -0400 (Thu, 17 Sep 2009) New Revision: 17643 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/JavaMemberELSegmentImpl.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/el/AbstractELCompletionEngine.java Log: JBIDE-4897: OpenOn's don't work for EL in xhtml pages. The open-ons operability is restored Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/JavaMemberELSegmentImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegmentImpl.java 2009-09-17 21:47:15 U= TC (rev 17642) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/JavaMemberELSegmentImpl.java 2009-09-17 22:40:05 U= TC (rev 17643) @@ -105,6 +105,7 @@ */ public void setMemberInfo(MemberInfo memberInfo) { this.memberInfo =3D memberInfo; + this.setElement(memberInfo !=3D null ? memberInfo.getJavaElement() : nul= l); } = /** Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/el/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-17 21:47:15 UTC (rev 17642) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/el/AbstractELCompletionEngine.java 2009-09-17 22:40:05 UTC (rev 17643) @@ -481,7 +481,6 @@ proposals.add(proposal); } segment.setMemberInfo(bijectedAttribute!=3Dnull?bijectedAttribute:memb= er); - segment.setElement(bijectedAttribute!=3Dnull?bijectedAttribute.getJava= Element():member!=3Dnull?member.getJavaElement():null); segment.getVariables().add(var); } // <<<=3D=3D=3D JBIDE-512, JBIDE-2541 related changes @@ -500,7 +499,6 @@ if (member !=3D null && !members.contains(member)) { = members.add(member); segment.setMemberInfo(member); - segment.setElement(member.getJavaElement()); segment.getVariables().add(var); segment.setResolved(true); } @@ -527,7 +525,6 @@ } if(!members.isEmpty()) { segment.setMemberInfo(members.get(0)); // TODO: This is a buggy way = to select a member to setup in a segment - segment.setElement(members.get(0).getJavaElement()); } resolution.addSegment(segment); } else { // Last segment @@ -756,7 +753,6 @@ proposalsToFilter.addAll(infos.getMethodPresentations()); proposalsToFilter.addAll(infos.getPropertyPresentations(segment.getUnp= airedGettersOrSetters())); segment.setMemberInfo(mbr); - segment.setElement(mbr!=3Dnull?mbr.getJavaElement():null); } for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter)= { // We do expect nothing but name for method tokens (No round brackets) @@ -773,7 +769,6 @@ kbProposals.add(kbProposal); = segment.setMemberInfo(proposal.getMember()); - segment.setElement(proposal.getMember()!=3Dnull?proposal.getMember()= .getJavaElement():null); if(segment.getUnpairedGettersOrSetters()!=3Dnull) { TypeInfoCollector.MethodInfo unpirMethod =3D segment.getUnpairedGet= tersOrSetters().get(filter); segment.clearUnpairedGettersOrSetters(); @@ -829,7 +824,6 @@ WebKbPlugin.getDefault().logError(jme); } segment.setMemberInfo(mbr); - segment.setElement(mbr!=3Dnull?mbr.getJavaElement():null); } = String filter =3D expr.getMemberName(); @@ -862,7 +856,6 @@ kbProposals.add(kbProposal); = segment.setMemberInfo(proposal.getMember()); - segment.setElement(proposal.getMember()!=3Dnull?proposal.getMember()= .getJavaElement():null); if(segment.getUnpairedGettersOrSetters()!=3Dnull) { TypeInfoCollector.MethodInfo unpirMethod =3D segment.getUnpairedGet= tersOrSetters().get(filter); segment.clearUnpairedGettersOrSetters(); --===============4286809847877945188==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 18:59:17 2009 Content-Type: multipart/mixed; boundary="===============3139110090187259626==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17644 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage. Date: Thu, 17 Sep 2009 18:59:17 -0400 Message-ID: <200909172259.n8HMxH2k008465@svn01.web.mwc.hst.phx2.redhat.com> --===============3139110090187259626== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-17 18:59:17 -0400 (Thu, 17 Sep 2009) New Revision: 17644 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclip= se/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java Log: https://bugs.eclipse.org/bugs/show_bug.cgi?id=3D289802 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/id= e/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09= -17 22:40:05 UTC (rev 17643) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09= -17 22:59:17 UTC (rev 17644) @@ -548,9 +548,12 @@ IVirtualComponent comp; for( int i =3D 0; i < refs.length; i++ ) { = comp =3D refs[i].getReferencedComponent(); - String val =3D refs[i].getRuntimePath().append(refs[i].getArchiveName()= ).toString(); - objectToRuntimePath.put(comp, val); - oldComponentToRuntimePath.put((IVirtualComponent) comp, val); + IPath val =3D refs[i].getRuntimePath(); + if( refs[i].getDependencyType() !=3D IVirtualReference.DEPENDENCY_TYPE_= CONSUMES) + val =3D val.append(refs[i].getArchiveName()); + = + objectToRuntimePath.put(comp, val.toString()); + oldComponentToRuntimePath.put((IVirtualComponent) comp, val.toString()); } = ComponentResource[] allMappings =3D findAllMappings(); --===============3139110090187259626==-- From jbosstools-commits at lists.jboss.org Thu Sep 17 20:00:42 2009 Content-Type: multipart/mixed; boundary="===============3603578123243167498==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17645 - in trunk/as/plugins: org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf and 2 other directories. Date: Thu, 17 Sep 2009 20:00:41 -0400 Message-ID: <200909180000.n8I00fQH020594@svn01.web.mwc.hst.phx2.redhat.com> --===============3603578123243167498== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-17 20:00:41 -0400 (Thu, 17 Sep 2009) New Revision: 17645 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/util/ResourceListVirtualFolder.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/FilesetVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclip= se/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragment.j= ava Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/util/LimitedContainerVirtualFolder.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml Log: Pushing even more forward with extensions for ESB project structure Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/i= de/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/LimitedContainerVirtualFolder.java 2009-09-17 22:59:= 17 UTC (rev 17644) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/LimitedContainerVirtualFolder.java 2009-09-18 00:00:= 41 UTC (rev 17645) @@ -1,69 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.core.util; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualFold= er; -import org.eclipse.wst.common.componentcore.resources.IVirtualResource; - -public class LimitedContainerVirtualFolder extends VirtualFolder { - - private IContainer[] containers; - public LimitedContainerVirtualFolder( - IProject aComponentProject, - IPath aRuntimePath, = - IContainer[] containers) { - super(aComponentProject, aRuntimePath); - this.containers =3D containers; - } - - public IContainer getUnderlyingFolder() { = - if( containers !=3D null && containers.length > 0 = - && containers[0] !=3D null ) - return containers[0]; - return null; - } - = - public IContainer[] getUnderlyingFolders() { - return containers =3D=3D null ? new IContainer[]{} : containers; - } - = - public IVirtualResource[] members(int memberFlags) throws CoreException { - List virtualResources =3D new ArrayList(); // result - Set allNames =3D new HashSet(); - = - for( int i =3D 0; i < containers.length; i++ ) { - IResource realResource =3D containers[i]; - if ((realResource !=3D null) && (realResource.getType() =3D=3D IResourc= e.FOLDER || realResource.getType() =3D=3D IResource.PROJECT)) { - IContainer realContainer =3D (IContainer) realResource; - IResource[] realChildResources =3D realContainer.members(memberFlags); - for (int realResourceIndex =3D 0; realResourceIndex < realChildResourc= es.length; realResourceIndex++) { - IResource child =3D realChildResources[realResourceIndex]; - String localName =3D child.getName(); - if (allNames.add(localName)) { - IPath newRuntimePath =3D getRuntimePath().append(localName); - if (child instanceof IFile) { - virtualResources.add(new VirtualFile(getProject(), newRuntimePath, = (IFile) child)); - } else { - virtualResources.add(ComponentCore.createFolder(getProject(), newRu= ntimePath)); - } - } - } - } - // An IResource.FILE would be an error condition (as this is a containe= r) - } - return virtualResources.toArray(new IVirtualResource[virtualResources.si= ze()]); - } - - = -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/id= e/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java (from rev 17524, = trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclips= e/as/wtp/core/util/LimitedContainerVirtualFolder.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ResourceListVirtualFolder.java = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-09-18 00:00:41 U= TC (rev 17645) @@ -0,0 +1,96 @@ +package org.jboss.ide.eclipse.as.wtp.core.util; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualFold= er; +import org.eclipse.wst.common.componentcore.resources.IVirtualResource; + +public class ResourceListVirtualFolder extends VirtualFolder { + + private ArrayList resources; + public ResourceListVirtualFolder( + IProject aComponentProject, + IPath aRuntimePath, = + IResource[] containers) { + super(aComponentProject, aRuntimePath); + this.resources =3D new ArrayList(); + this.resources.addAll(Arrays.asList(containers)); + } + + protected void addResource(IResource c) { + //this.resources.add(c); + } + = + public IResource getUnderlyingResource() { + // Since I'm a container, pretend I'm a container I guess + return getUnderlyingFolder(); + } + = + public IResource[] getUnderlyingResources() { + return getUnderlyingFolders(); + } + + public IContainer getUnderlyingFolder() { = + IResource[] r =3D (IResource[]) resources.toArray(new IResource[resource= s.size()]); + for( int i =3D 0; i < r.length; i++ ) + if( r[i] instanceof IContainer ) + return (IContainer)r[i]; + return null; + } + = + public IContainer[] getUnderlyingFolders() { + IResource[] r =3D (IResource[]) resources.toArray(new IResource[resource= s.size()]); + ArrayList c =3D new ArrayList(); + for( int i =3D 0; i < r.length; i++ ) + if( r[i] instanceof IContainer ) + c.add((IContainer)r[i]); + return (IContainer[]) c.toArray(new IContainer[c.size()]); + } + = + public IVirtualResource[] members(int memberFlags) throws CoreException { + List virtualResources =3D new ArrayList(); // result + Set allNames =3D new HashSet(); + IResource[] containers2 =3D (IResource[]) this.resources.toArray(new IRe= source[this.resources.size()]); + for( int i =3D 0; i < containers2.length; i++ ) { + IResource realResource =3D containers2[i]; + if ((realResource !=3D null) && (realResource.getType() =3D=3D IResourc= e.FOLDER || realResource.getType() =3D=3D IResource.PROJECT)) { + IContainer realContainer =3D (IContainer) realResource; + IResource[] realChildResources =3D realContainer.members(memberFlags); + for (int realResourceIndex =3D 0; realResourceIndex < realChildResourc= es.length; realResourceIndex++) { + IResource child =3D realChildResources[realResourceIndex]; + String localName =3D child.getName(); + if (allNames.add(localName)) { + IPath newRuntimePath =3D getRuntimePath().append(localName); + if (child instanceof IFile) { + virtualResources.add(new VirtualFile(getProject(), newRuntimePath, = (IFile) child)); + } else if( child instanceof IContainer ){ + IContainer childContainer =3D (IContainer)child; + IResource[] members =3D childContainer.members(); + ResourceListVirtualFolder childFolder =3D = + new ResourceListVirtualFolder(getProject(), newRuntimePath, member= s); + virtualResources.add(childFolder); + } + } + } + } else if(realResource !=3D null && realResource instanceof IFile) { + // An IResource.FILE would be an error condition (as this is a contain= er) + virtualResources.add(new VirtualFile(getProject(), = + getRuntimePath().append(((IFile)realResource).getName()), (IFile)rea= lResource)); = + } + } + return virtualResources.toArray(new IVirtualResource[virtualResources.si= ze()]); + } + + = +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide= /eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2009-09-18 = 00:00:41 UTC (rev 17645) @@ -0,0 +1,68 @@ +package org.jboss.ide.eclipse.as.wtp.core.vcf; + +import org.eclipse.core.internal.resources.Workspace; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.emf.common.util.URI; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage; +import org.eclipse.wst.common.componentcore.internal.DependencyType; +import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; +import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModul= eConnection; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; + +public class ExportedClassFolderReferenceResolver implements IReferenceRes= olver { + public static final String OUTPUT_FOLDER_SEGMENT =3D "org.jboss.ide.eclip= se.as.wtp.core.vcf.exportedClassFolders"; + public static final String OUTPUT_FOLDER_PROTOCOL =3D PlatformURLModuleCo= nnection.MODULE_PROTOCOL + +IPath.SEPARATOR+ OUTPUT_FOLDER_SEGMENT + IPath.SEPARATOR; + public ExportedClassFolderReferenceResolver() { + } + + public boolean canResolve(IVirtualComponent context, + ReferencedComponent referencedComponent) { + URI handle =3D referencedComponent.getHandle(); + String s =3D handle.toString(); + if(s.startsWith(OUTPUT_FOLDER_PROTOCOL)) + return true; + return false; + } + + public boolean canResolve(IVirtualReference reference) { + if( reference.getReferencedComponent() instanceof ExportedClasspathFolde= rsVirtualComponent ) + return true; + return false; + } + + public IVirtualReference resolve(IVirtualComponent context, + ReferencedComponent referencedComponent) { + String project =3D referencedComponent.getHandle().segment(1); + IProject p =3D null; + if( !project.equals("")) = + p =3D ResourcesPlugin.getWorkspace().getRoot().getProject(project); + else + p =3D context.getProject(); + IVirtualComponent comp =3D new ExportedClasspathFoldersVirtualComponent(= p, context); + IVirtualReference ref =3D ComponentCore.createReference(context, comp); + ref.setArchiveName(referencedComponent.getArchiveName()); + ref.setRuntimePath(referencedComponent.getRuntimePath()); + ref.setDependencyType(referencedComponent.getDependencyType().getValue()= ); + return ref; + } + + public ReferencedComponent resolve(IVirtualReference reference) { + if( reference.getReferencedComponent() instanceof ExportedClasspathFolde= rsVirtualComponent ) { + ExportedClasspathFoldersVirtualComponent comp =3D (ExportedClasspathFol= dersVirtualComponent)reference.getReferencedComponent(); + IProject p =3D reference.getReferencedComponent().getProject(); + ReferencedComponent rc =3D ComponentcorePackage.eINSTANCE.getComponentc= oreFactory().createReferencedComponent(); + rc.setArchiveName(reference.getArchiveName()); + rc.setRuntimePath(reference.getRuntimePath()); + rc.setHandle(URI.createURI(comp.getId())); + rc.setDependencyType(DependencyType.CONSUMES_LITERAL); + return rc; + } + return null; + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide= /eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java 2009-09= -18 00:00:41 UTC (rev 17645) @@ -0,0 +1,59 @@ +package org.jboss.ide.eclipse.as.wtp.core.vcf; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IClasspathAttribute; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; + +public class ExportedClasspathFoldersVirtualComponent extends FilesetVirtu= alComponent { + public ExportedClasspathFoldersVirtualComponent(IProject p, IVirtualCompo= nent referencingComponent) { + super(p,referencingComponent); + } + + protected String getFirstIdSegment() { + return ExportedClassFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; + } + + protected IResource[] getExposableResources() { + IJavaProject jp =3D JavaCore.create(project); + IClasspathEntry[] entries =3D findAllClassFolderEntries(jp); + ArrayList results =3D new ArrayList(); + for( int i =3D 0; i < entries.length; i++ ) { + IClasspathAttribute attribute =3D ClasspathDependencyUtil.checkForCompo= nentDependencyAttribute( + entries[i], + ClasspathDependencyUtil.DependencyAttributeType.CLASSPATH_COMPONENT_D= EPENDENCY); + = + if( attribute !=3D null ) { + final IResource resource =3D ResourcesPlugin.getWorkspace().getRoot().= findMember(entries[i].getPath()); + if (resource !=3D null && resource instanceof IContainer ) { + results.add(resource); + } + } + } + return (IResource[]) results.toArray(new IResource[results.size()]); + } + = + protected IClasspathEntry[] findAllClassFolderEntries(IJavaProject javaPr= oject) { + List list =3D new ArrayList(); + try { + IClasspathEntry[] entries =3D javaProject.getRawClasspath(); + for( int i =3D 0; i < entries.length; i++ ) { + if( ClasspathDependencyUtil.isClassFolderEntry(entries[i])) + list.add(entries[i]); + } + } catch( CoreException ce) { + } = + return list.toArray(new IClasspathEntry[list.size()]); + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide= /eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/FilesetVirtualComponent.java = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-09-18 00:00:41 UTC = (rev 17645) @@ -0,0 +1,120 @@ +package org.jboss.ide.eclipse.as.wtp.core.vcf; + +import java.util.Properties; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.jboss.ide.eclipse.as.wtp.core.util.ResourceListVirtualFolder; + +public abstract class FilesetVirtualComponent implements IVirtualComponent= { + protected IProject project; + protected IVirtualComponent referencingComp; = + + public FilesetVirtualComponent(IProject p, IVirtualComponent referencingC= omponent) { + this.project =3D p; + this.referencingComp =3D referencingComponent; + } + + public void create(int updateFlags, IProgressMonitor aMonitor) + throws CoreException { + // Ignore + } + + public boolean exists() { + return true; + } + + public IVirtualComponent getComponent() { + return this; + } + + public String getName() { + return getId(); + } + + public String getDeployedName() { + return getName(); + } + + protected String getId() { + String firstSegment =3D getFirstIdSegment(); + if (project.equals(referencingComp.getProject())) + return firstSegment; = + = + return firstSegment + Path.SEPARATOR + project.getName(); + } + + protected abstract String getFirstIdSegment(); + = + public IProject getProject() { + return project; + } + + public IVirtualComponent[] getReferencingComponents() { + return referencingComp =3D=3D null ? new IVirtualComponent[] {} + : new IVirtualComponent[] { referencingComp }; + } + + public IVirtualFolder getRootFolder() { + IResource[] resources =3D getExposableResources(); + return new ResourceListVirtualFolder( + project, new Path("/"), resources); + } + + protected abstract IResource[] getExposableResources(); + = + public Properties getMetaProperties() { + return null; + } + + public IPath[] getMetaResources() { + return null; + } + + public IVirtualReference getReference(String aComponentName) { + // Ignore + return null; + } + + public IVirtualReference[] getReferences() { + // Ignore; no children + return new IVirtualReference[] {}; + } + + public boolean isBinary() { + return false; + } + + public void setMetaProperties(Properties properties) { + // Ignore + } + + public void setMetaProperty(String name, String value) { + // Ignore + } + + public void setMetaResources(IPath[] theMetaResourcePaths) { + // Ignore + } + + public void setReferences(IVirtualReference[] theReferences) { + // Ignore + } + + public Object getAdapter(Class adapter) { + // Ignore + return null; + } + + public void addReferences(IVirtualReference[] references) { + // Ignore + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-17 22:59:1= 7 UTC (rev 17644) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-18 00:00:4= 1 UTC (rev 17645) @@ -2,74 +2,28 @@ = import java.util.ArrayList; import java.util.List; -import java.util.Properties; = import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; +import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.jboss.ide.eclipse.as.wtp.core.util.LimitedContainerVirtualFolde= r; = -public class OutputFoldersVirtualComponent implements IVirtualComponent { +public class OutputFoldersVirtualComponent extends FilesetVirtualComponent= { = - private IProject project; - private IVirtualComponent referencingComp; - = public OutputFoldersVirtualComponent(IProject p, IVirtualComponent refere= ncingComponent) { - this.project =3D p; - this.referencingComp =3D referencingComponent; + super(p, referencingComponent); } = - public void create(int updateFlags, IProgressMonitor aMonitor) - throws CoreException { - // Ignore + protected String getFirstIdSegment() { + return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; } = - public boolean exists() { - return true; - } - - public IVirtualComponent getComponent() { - return this; - } - - public String getName() { - return getId(); - } - - public String getDeployedName() { - return getName(); - } - = - protected String getId() { - if( project.equals(referencingComp.getProject())) - return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; - return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL + Path.SEPAR= ATOR + project.getName(); - } - - public IProject getProject() { - return project; - } - public IVirtualComponent[] getReferencingComponents() { - return referencingComp =3D=3D null ? new IVirtualComponent[]{} : new IVi= rtualComponent[]{referencingComp}; - } - - public IVirtualFolder getRootFolder() { - IContainer[] containers =3D getOutputContainers(project); - return new LimitedContainerVirtualFolder(project, new Path("/"), contain= ers); - } - = - private static IContainer[] getOutputContainers(IProject project) { + protected IResource[] getExposableResources() { List result =3D new ArrayList(); try { if (!project.hasNature(JavaCore.NATURE_ID)) @@ -102,55 +56,4 @@ } return list.toArray(new IPackageFragmentRoot[list.size()]); } - = - = - public Properties getMetaProperties() { - // TODO Auto-generated method stub - return null; - } - - public IPath[] getMetaResources() { - // TODO Auto-generated method stub - return null; - } - - public IVirtualReference getReference(String aComponentName) { - // Ignore - return null; - } - - public IVirtualReference[] getReferences() { - // Ignore; no children - return new IVirtualReference[]{}; - } - - public boolean isBinary() { - return false; - } - - public void setMetaProperties(Properties properties) { - // Ignore - } - - public void setMetaProperty(String name, String value) { - // Ignore - } - - public void setMetaResources(IPath[] theMetaResourcePaths) { - // Ignore - } - - public void setReferences(IVirtualReference[] theReferences) { - // Ignore - } - - public Object getAdapter(Class adapter) { - // Ignore - return null; - } - - public void addReferences(IVirtualReference[] references) { - // Ignore - } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-09-17 = 22:59:17 UTC (rev 17644) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-09-18 = 00:00:41 UTC (rev 17645) @@ -58,8 +58,14 @@ + + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/e= clipse/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragme= nt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragment.= java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/ExportedClasspathFoldersReferenceWizardFragment.= java 2009-09-18 00:00:41 UTC (rev 17645) @@ -0,0 +1,212 @@ +package org.jboss.ide.eclipse.as.wtp.ui.propertypage; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClasspathAttribute; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; +import org.eclipse.jst.j2ee.internal.classpathdep.UpdateClasspathAttribute= sDataModelProvider; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.SharedImages; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; +import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.jboss.ide.eclipse.as.wtp.core.vcf.ExportedClasspathFoldersVirtu= alComponent; + +public class ExportedClasspathFoldersReferenceWizardFragment extends + WizardFragment { + + protected TreeViewer viewer; + protected IPath[] paths; + protected IWizardHandle handle; + protected IStructuredSelection selected =3D null; + protected IStructuredSelection initialSelection =3D null; + protected Object[] allElements; + public ExportedClasspathFoldersReferenceWizardFragment() { + super(); + } + + public boolean hasComposite() { + return true; + } + = + public Composite createComposite(Composite parent, IWizardHandle handle) { + this.handle =3D handle; + int x =3D 1; + handle.setTitle("Add exported folders from the build pathx"); + handle.setDescription("This reference will allow you to add references t= o exported classpaths from this project's build page. Please select all ent= ries you wish to be published."); + IVirtualComponent parentComp =3D (IVirtualComponent)getTaskModel().getOb= ject(NewReferenceWizard.ROOT_COMPONENT); + IProject project =3D parentComp.getProject(); + IJavaProject javaProject =3D JavaCore.create(project); + allElements =3D findAllClassFolderEntries(javaProject); + + Composite c =3D new Composite(parent, SWT.NONE); + c.setLayout(new FormLayout()); + viewer =3D new TreeViewer(c, SWT.MULTI | SWT.BORDER); + viewer.setContentProvider(getContentProvider()); + viewer.setLabelProvider(getLabelProvider()); + viewer.setInput(ResourcesPlugin.getWorkspace()); + + FormData fd =3D new FormData(); + fd.left =3D new FormAttachment(0, 5); + fd.top =3D new FormAttachment(0, 5); + fd.right =3D new FormAttachment(100, -5); + fd.bottom =3D new FormAttachment(100, -5); + viewer.getTree().setLayoutData(fd); + viewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + selected =3D (IStructuredSelection)viewer.getSelection(); + } + }); + = + ArrayList withTag =3D new ArrayList(); + for( int i =3D 0; i < allElements.length; i++ ) { + IClasspathAttribute attribute =3D ClasspathDependencyUtil.checkForCompo= nentDependencyAttribute( + ((IClasspathEntry)allElements[i]), + ClasspathDependencyUtil.DependencyAttributeType.CLASSPATH_COMPONENT_D= EPENDENCY); + = + if( attribute !=3D null ) + withTag.add((IClasspathEntry)allElements[i]); + } + = + StructuredSelection newSel =3D new StructuredSelection(withTag); + viewer.setSelection(newSel); + initialSelection =3D newSel; + return c; + } + = + protected IClasspathEntry[] findAllClassFolderEntries(IJavaProject javaPr= oject) { + List list =3D new ArrayList(); + try { + IClasspathEntry[] entries =3D javaProject.getRawClasspath(); + for( int i =3D 0; i < entries.length; i++ ) { + if( ClasspathDependencyUtil.isClassFolderEntry(entries[i])) + list.add(entries[i]); + } + } catch( CoreException ce) { + } = + return list.toArray(new IClasspathEntry[list.size()]); + } + = + private ITreeContentProvider getContentProvider() { + return new ITreeContentProvider() { + public Object[] getElements(Object inputElement) { + IVirtualComponent parentComp =3D (IVirtualComponent)getTaskModel().get= Object(NewReferenceWizard.ROOT_COMPONENT); + IProject project =3D parentComp.getProject(); + IJavaProject jp =3D JavaCore.create(project); + if( jp !=3D null ) { + return findAllClassFolderEntries(jp); + } + return new Object[]{}; + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInpu= t) { + } + public void dispose() { + } + public boolean hasChildren(Object element) { + return false; + } + public Object getParent(Object element) { + return null; + } + public Object[] getChildren(Object parentElement) { + return null; + } + }; + } + = + private LabelProvider getLabelProvider() { + return new LabelProvider() { + public Image getImage(Object element) { + return PlatformUI.getWorkbench().getSharedImages().getImage(SharedImag= es.IMG_OBJ_PROJECT); + } + public String getText(Object element) { + return element instanceof IProject ? ((IProject)element).getName() : e= lement.toString(); + } + }; + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent parentComp =3D (IVirtualComponent)getTaskModel().getOb= ject(NewReferenceWizard.ROOT_COMPONENT); + try { + Map toAdd =3D new HashMap(); + Map toRemove =3D new HashMap(); + + List pre =3D Arrays.asList(initialSelection.toArray()); + List post =3D Arrays.asList(selected.toArray()); + for( int i =3D 0; i < allElements.length; i++ ) { + if( pre.contains(allElements[i]) && !post.contains(allElements[i])) { + toRemove.put((IClasspathEntry)allElements[i], getOriginalPath((IClass= pathEntry)allElements[i])); + } = + else if( !pre.contains(allElements[i]) && post.contains(allElements[i]= )) { + toAdd.put((IClasspathEntry)allElements[i], getNewPath((IClasspathEntr= y)allElements[i])); = + } + } + = + UpdateClasspathAttributesDataModelProvider provider =3D new UpdateClass= pathAttributesDataModelProvider(); + IDataModel model =3D DataModelFactory.createDataModel(provider); + model.setProperty(UpdateClasspathAttributesDataModelProvider.PROJECT_NA= ME, parentComp.getProject().getName()); + model.setProperty(UpdateClasspathAttributesDataModelProvider.ENTRIES_TO= _ADD_ATTRIBUTE, toAdd); + model.getDefaultOperation().execute(new NullProgressMonitor(), null); + + provider =3D new UpdateClasspathAttributesDataModelProvider(); + model =3D DataModelFactory.createDataModel(provider); + model.setProperty(UpdateClasspathAttributesDataModelProvider.PROJECT_NA= ME, parentComp.getProject().getName()); + model.setProperty(UpdateClasspathAttributesDataModelProvider.ENTRIES_TO= _REMOVE_ATTRIBUTE, toRemove); + model.getDefaultOperation().execute(new NullProgressMonitor(), null); + + } catch( ExecutionException ee) { + = + } + = + ExportedClasspathFoldersVirtualComponent vc =3D new ExportedClasspathFol= dersVirtualComponent(parentComp.getProject(), parentComp); + getTaskModel().putObject(NewReferenceWizard.COMPONENT, vc); + getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, "/"); + } + = + protected IPath getOriginalPath(IClasspathEntry entry) { + final IClasspathAttribute[] attributes =3D entry.getExtraAttributes(); + for (int i =3D 0; i < attributes.length; i++) { + final IClasspathAttribute attribute =3D attributes[i]; + final String name =3D attribute.getName(); + if (name.equals(ClasspathDependencyUtil.CLASSPATH_COMPONENT_DEPENDEN= CY)) { + return new Path(attribute.getValue()); + } + } + return new Path("/"); + } + = + protected IPath getNewPath(IClasspathEntry cpe) { + return new Path("/"); + } +} --===============3603578123243167498==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 03:57:39 2009 Content-Type: multipart/mixed; boundary="===============5324597702030121216==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17646 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist. Date: Fri, 18 Sep 2009 03:57:39 -0400 Message-ID: <200909180757.n8I7vdkN015789@svn01.web.mwc.hst.phx2.redhat.com> --===============5324597702030121216== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-18 03:57:39 -0400 (Fri, 18 Sep 2009) New Revision: 17646 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/AbstractXMLContentAssistProcessor.java Log: JBIDE-4911: NPE occurres while invoking the CA in an empty editor Issue is fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/AbstractXMLContentAssistProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/AbstractXMLContentAssistProcessor.java 2009-09-18 00:00:41 UTC= (rev 17645) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/AbstractXMLContentAssistProcessor.java 2009-09-18 07:57:39 UTC= (rev 17646) @@ -379,6 +379,7 @@ */ @Override protected String getMatchString(IStructuredDocumentRegion parent, ITextRe= gion aRegion, int offset) { + if (aRegion =3D=3D null) return ""; String matchString =3D super.getMatchString(parent, aRegion, offset); String regionType =3D aRegion.getType(); if(regionType =3D=3D DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchSt= ring.startsWith("\"")) { //$NON-NLS-1$ --===============5324597702030121216==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 04:09:32 2009 Content-Type: multipart/mixed; boundary="===============5088134527112951730==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17647 - in trunk/common/plugins/org.jboss.tools.common.model: resources/meta and 1 other directories. Date: Fri, 18 Sep 2009 04:09:32 -0400 Message-ID: <200909180809.n8I89WPl018112@svn01.web.mwc.hst.phx2.redhat.com> --===============5088134527112951730== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 04:09:32 -0400 (Fri, 18 Sep 2009) New Revision: 17647 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/java/jsp/model/ Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.m= eta Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Deprecated implementation FileJSPImpl removed. Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18= 07:57:39 UTC (rev 17646) +++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18= 08:09:32 UTC (rev 17647) @@ -82,8 +82,6 @@ - --===============5088134527112951730==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 05:15:20 2009 Content-Type: multipart/mixed; boundary="===============6827422951027156912==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17648 - in trunk/common/plugins/org.jboss.tools.common.model: resources/help and 2 other directories. Date: Fri, 18 Sep 2009 05:15:20 -0400 Message-ID: <200909180915.n8I9FKJJ031318@svn01.web.mwc.hst.phx2.redhat.com> --===============6827422951027156912== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 05:15:20 -0400 (Fri, 18 Sep 2009) New Revision: 17648 Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-mo= del.properties trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-mo= del_ja.properties trunk/common/plugins/org.jboss.tools.common.model/resources/meta/base.me= ta trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.m= eta trunk/common/plugins/org.jboss.tools.common.model/resources/meta/filesys= tems.meta trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/loaders/impl/MappedEntityRecognizer.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Definitions of model objects for jsp, html, xhtml moved to jst.web. Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFE= ST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF = 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF = 2009-09-18 09:15:20 UTC (rev 17648) @@ -11,7 +11,6 @@ Export-Package: org.jboss.tools.common.ant.model, org.jboss.tools.common.ant.model.handlers, org.jboss.tools.common.ant.parser, - org.jboss.tools.common.java.jsp.model, org.jboss.tools.common.java.model.handler, org.jboss.tools.common.meta, org.jboss.tools.common.meta.action, Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/help/= keys-model.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-m= odel.properties 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-m= odel.properties 2009-09-18 09:15:20 UTC (rev 17648) @@ -191,111 +191,6 @@ FileSystemFolder_CreateFile.WindowTitle=3DNew File FileSystemFolder_CreateFile.Title=3DFile = -##### File JSP ##### - -# START NON-TRANSLATABLE -FileJSP=3D/model/FileJSP.html -# END NON-TRANSLATABLE -# START NON-TRANSLATABLE -FileJSP_Properties=3D/model/FileJSP.html -# END NON-TRANSLATABLE -FileJSP_Properties.Title=3DFile JSP -# START NON-TRANSLATABLE -FileJSP_Rename=3D/model/FileJSP.html -# END NON-TRANSLATABLE - -##### Create File JSP ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileJSP=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileJSP.WindowTitle=3DNew File JSP -FileFolder_CreateFileJSP.Title=3DFile JSP -FileFolder_CreateFileJSP_1.Title=3DSelect Tag Libraries - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileJSP=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileJSP.WindowTitle=3DNew File JSP -FileSystemFolder_CreateFileJSP.Title=3DFile JSP -FileSystemFolder_CreateFileJSP_1.Title=3DSelect Tag Libraries - -##### File XHTML ##### - -# START NON-TRANSLATABLE -FileXHTML_Properties=3D/model/FileProperty.html -# END NON-TRANSLATABLE -FileXHTML_Properties.Title=3DFile XHTML -# START NON-TRANSLATABLE -FileXHTML_Rename=3D/model/FileXHTML.html -# END NON-TRANSLATABLE - -##### Create File JSP ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileXHTML=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileXHTML.WindowTitle=3DNew File XHTML -FileFolder_CreateFileXHTML.Title=3DFile XHTML -FileFolder_CreateFileXHTML_1.Title=3DSelect Tag Libraries - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileXHTML=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileXHTML.WindowTitle=3DNew File XHTML -FileSystemFolder_CreateFileXHTML.Title=3DFile XHTML -FileSystemFolder_CreateFileXHTML_1.Title=3DSelect Tag Libraries - -##### File HTML ##### -# START NON-TRANSLATABLE -FileHTML=3D/model/FileHTML.html -# END NON-TRANSLATABLE - -# START NON-TRANSLATABLE -FileHTML_Properties=3D/model/FileProperty.html -# END NON-TRANSLATABLE -FileHTML_Properties.Title=3DFile HTML -# START NON-TRANSLATABLE -FileHTML_Rename=3D/model/FileHTML.html -# END NON-TRANSLATABLE - -##### Create File HTML ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileHTML=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileHTML.WindowTitle=3DNew File HTML -FileFolder_CreateFileHTML.Title=3DFile HTML - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileHTML=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileHTML.WindowTitle=3DNew File HTML -FileSystemFolder_CreateFileHTML.Title=3DFile HTML - -##### File XSL ##### - -# START NON-TRANSLATABLE -FileXSL=3D/model/FileXSL.html -# END NON-TRANSLATABLE - -# START NON-TRANSLATABLE -FileXSL_Properties=3D/model/FileProperty.html -# END NON-TRANSLATABLE -FileXSL_Properties.Title=3DFile XSL - -##### Create File XSL ##### - -# START NON-TRANSLATABLE -FileFolder_CreateFileXSL=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileFolder_CreateFileXSL.WindowTitle=3DNew File XSL - -# START NON-TRANSLATABLE -FileSystemFolder_CreateFileXSL=3D/model/CreateFile.html -# END NON-TRANSLATABLE -FileSystemFolder_CreateFileXSL.WindowTitle=3DNew File XSL - ##### Create File Properties ##### = # START NON-TRANSLATABLE @@ -637,18 +532,6 @@ TrialLimitation=3D/limitedversion.html # END NON-TRANSLATABLE = -# START NON-TRANSLATABLE -JSPLinkRecognizer_CreateLink=3D/model/OptionsEditor.html -# END NON-TRANSLATABLE -JSPLinkRecognizer_CreateLink.WindowTitle=3DAdd Link Recognizer Rule -JSPLinkRecognizer_CreateLink.Title=3DLink Recognizer Rule - -# START NON-TRANSLATABLE -JSPLink_Edit=3D/model/OptionsEditor.html -# END NON-TRANSLATABLE -JSPLink_Edit.WindowTitle=3DEdit -JSPLink_Edit.Title=3DLink Recognizer Rule - #Wizard-Common.begin = org.jboss.tools.jst.web.ui.wizards.project.ImportWebWarWizard.mainPageProm= pt=3DSelect *.war file Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/help/= keys-model_ja.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-m= odel_ja.properties 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/help/keys-m= odel_ja.properties 2009-09-18 09:15:20 UTC (rev 17648) @@ -34,28 +34,6 @@ FileFolder_CreateFile.Title=3D\u30D5\u30A1\u30A4\u30EB FileSystemFolder_CreateFile.WindowTitle=3D\u65B0\u898F\u30D5\u30A1\u30A4\u= 30EB FileSystemFolder_CreateFile.Title=3D\u30D5\u30A1\u30A4\u30EB -FileJSP_Properties.Title=3DJSP \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileJSP.WindowTitle=3D\u65B0\u898F JSP \u30D5\u30A1\u30A4= \u30EB -FileFolder_CreateFileJSP.Title=3DJSP \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileJSP_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u3= 0E9\u30EA\u30FC\u306E\u9078\u629E -FileSystemFolder_CreateFileJSP.WindowTitle=3D\u65B0\u898F JSP \u30D5\u30A1= \u30A4\u30EB -FileSystemFolder_CreateFileJSP.Title=3DJSP \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileJSP_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\u3= 0D6\u30E9\u30EA\u30FC\u306E\u9078\u629E -FileXHTML_Properties.Title=3DXHTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileXHTML.WindowTitle=3D\u65B0\u898F XHTML \u30D5\u30A1\u= 30A4\u30EB -FileFolder_CreateFileXHTML.Title=3DXHTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileXHTML_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\= u30E9\u30EA\u30FC\u306E\u9078\u629E -FileSystemFolder_CreateFileXHTML.WindowTitle=3D\u65B0\u898F XHTML \u30D5\u= 30A1\u30A4\u30EB -FileSystemFolder_CreateFileXHTML.Title=3DXHTML \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileXHTML_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\= u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E -FileHTML_Properties.Title=3DHTML \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileHTML.WindowTitle=3D\u65B0\u898F HTML \u30D5\u30A1\u30= A4\u30EB -FileFolder_CreateFileHTML.Title=3DHTML \u30D5\u30A1\u30A4\u30EB -FileSystemFolder_CreateFileHTML.WindowTitle=3D\u65B0\u898F HTML \u30D5\u30= A1\u30A4\u30EB -FileSystemFolder_CreateFileHTML.Title=3DHTML \u30D5\u30A1\u30A4\u30EB -FileXSL_Properties.Title=3DXSL \u30D5\u30A1\u30A4\u30EB -FileFolder_CreateFileXSL.WindowTitle=3D\u65B0\u898F XSL \u30D5\u30A1\u30A4= \u30EB -FileSystemFolder_CreateFileXSL.WindowTitle=3D\u65B0\u898F XSL \u30D5\u30A1= \u30A4\u30EB FileFolder_CreateFileProperties.WindowTitle=3D\u65B0\u898F\u30D7\u30ED\u30= D1\u30C6\u30A3\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB FileFolder_CreateFileProperties.Title=3D\u30D7\u30ED\u30D1\u30C6\u30A3\u30= FC\u30FB\u30D5\u30A1\u30A4\u30EB FileSystemFolder_CreateFileProperties.WindowTitle=3D\u65B0\u898F\u30D7\u30= ED\u30D1\u30C6\u30A3\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB @@ -124,10 +102,6 @@ SharableReportProblem.eMail=3DE-Mail SharableReportProblem.attachRedHatLog=3D\u5831\u544A\u306B\u30B9\u30BF\u30= C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3092\u542B\u3081\u308B SharableReportProblem.attachEclipseLog=3D\u5831\u544A\u306B Eclipse .log \= u3092\u542B\u3081\u308B -JSPLinkRecognizer_CreateLink.WindowTitle=3D\u30EA\u30F3\u30AF\u8A8D\u8B58\= u30EB\u30FC\u30EB\u306E\u8FFD\u52A0 -JSPLinkRecognizer_CreateLink.Title=3D\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\= u30FC\u30EB -JSPLink_Edit.WindowTitle=3D\u7DE8\u96C6 -JSPLink_Edit.Title=3D\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB org.jboss.tools.jst.web.ui.wizards.project.ImportWebWarWizard.mainPageProm= pt=3D*.war \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u30= 60\u3055\u3044 WebPrjAdoptStepName_web.xml_location=3Dweb.xml \u30ED\u30B1\u30FC\u30B7\u3= 0E7\u30F3 WebPrjAdoptStepName_name=3D\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/= base.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/base.m= eta 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/base.m= eta 2009-09-18 09:15:20 UTC (rev 17648) @@ -91,20 +91,12 @@ - - - - - - - - - + @@ -139,16 +131,12 @@ - - - - @@ -205,21 +193,15 @@ - - - - - - Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/= files.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.= meta 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/files.= meta 2009-09-18 09:15:20 UTC (rev 17648) @@ -90,187 +90,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -445,161 +264,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -628,18 +292,6 @@ - - - - - - - - - - - - @@ -714,12 +366,8 @@ - - - - - - - - @@ -761,12 +405,8 @@ - - - - @@ -779,12 +419,8 @@ - - - - Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/= filesystems.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/filesy= stems.meta 2009-09-18 08:09:32 UTC (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/filesy= stems.meta 2009-09-18 09:15:20 UTC (rev 17648) @@ -13,14 +13,9 @@ - - - - - Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/loaders/impl/MappedEntityRecognizer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/loaders/impl/MappedEntityRecognizer.java 2009-09-18 08:09:32 UT= C (rev 17647) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/loaders/impl/MappedEntityRecognizer.java 2009-09-18 09:15:20 UT= C (rev 17648) @@ -11,18 +11,25 @@ package org.jboss.tools.common.model.loaders.impl; = import java.util.*; + +import org.jboss.tools.common.meta.XMapping; +import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; import org.jboss.tools.common.model.loaders.*; = public class MappedEntityRecognizer implements EntityRecognizer { + static String MAPPED_ENTITIES =3D "MappedEntities"; //$NON-NLS-1$ private Map map =3D new HashMap(); = public MappedEntityRecognizer() { - map.put("bpf", "FileProcess"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("htm", "FileHTML"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("flow", "FileFlow"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("jspx", "FileJSP"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("jspf", "FileJSP"); //$NON-NLS-1$ //$NON-NLS-2$ - map.put("jsf", "FileHTML"); //$NON-NLS-1$ //$NON-NLS-2$ + XMapping m =3D XModelMetaDataImpl.getInstance().getMapping(MAPPED_ENTITI= ES); + if(m !=3D null) { + String[] ks =3D m.getKeys(); + for (int i =3D 0; i < ks.length; i++) { + String extension =3D ks[i]; + String entity =3D m.getValue(extension); + map.put(extension, entity); + } + } } = // NB i18n: there is code that depends on these entity names (in English) --===============6827422951027156912==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 05:18:49 2009 Content-Type: multipart/mixed; boundary="===============5052208901559764068==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17649 - in trunk/jst/plugins/org.jboss.tools.jst.web: resources/help and 1 other directories. Date: Fri, 18 Sep 2009 05:18:49 -0400 Message-ID: <200909180918.n8I9InSL031876@svn01.web.mwc.hst.phx2.redhat.com> --===============5052208901559764068== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 05:18:49 -0400 (Fri, 18 Sep 2009) New Revision: 17649 Added: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.proper= ties trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web_ja.pro= perties Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Definitions of model objects for jsp, html, xhtml moved to jst.web. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 09:15:2= 0 UTC (rev 17648) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 09:18:4= 9 UTC (rev 17649) @@ -19,6 +19,8 @@ + + Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web= .properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.prope= rties 2009-09-18 09:15:20 UTC (rev 17648) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.prope= rties 2009-09-18 09:18:49 UTC (rev 17649) @@ -1,6 +1,111 @@ WebPrjAdoptStepName.web.xml_location=3Dweb.xml Location ##### Some Files ##### = +##### File JSP ##### + +# START NON-TRANSLATABLE +FileJSP=3D/model/FileJSP.html +# END NON-TRANSLATABLE +# START NON-TRANSLATABLE +FileJSP_Properties=3D/model/FileJSP.html +# END NON-TRANSLATABLE +FileJSP_Properties.Title=3DFile JSP +# START NON-TRANSLATABLE +FileJSP_Rename=3D/model/FileJSP.html +# END NON-TRANSLATABLE + +##### Create File JSP ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileJSP=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileJSP.WindowTitle=3DNew File JSP +FileFolder_CreateFileJSP.Title=3DFile JSP +FileFolder_CreateFileJSP_1.Title=3DSelect Tag Libraries + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileJSP=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileJSP.WindowTitle=3DNew File JSP +FileSystemFolder_CreateFileJSP.Title=3DFile JSP +FileSystemFolder_CreateFileJSP_1.Title=3DSelect Tag Libraries + +##### File XHTML ##### + +# START NON-TRANSLATABLE +FileXHTML_Properties=3D/model/FileProperty.html +# END NON-TRANSLATABLE +FileXHTML_Properties.Title=3DFile XHTML +# START NON-TRANSLATABLE +FileXHTML_Rename=3D/model/FileXHTML.html +# END NON-TRANSLATABLE + +##### Create File JSP ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileXHTML=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileXHTML.WindowTitle=3DNew File XHTML +FileFolder_CreateFileXHTML.Title=3DFile XHTML +FileFolder_CreateFileXHTML_1.Title=3DSelect Tag Libraries + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileXHTML=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileXHTML.WindowTitle=3DNew File XHTML +FileSystemFolder_CreateFileXHTML.Title=3DFile XHTML +FileSystemFolder_CreateFileXHTML_1.Title=3DSelect Tag Libraries + +##### File HTML ##### +# START NON-TRANSLATABLE +FileHTML=3D/model/FileHTML.html +# END NON-TRANSLATABLE + +# START NON-TRANSLATABLE +FileHTML_Properties=3D/model/FileProperty.html +# END NON-TRANSLATABLE +FileHTML_Properties.Title=3DFile HTML +# START NON-TRANSLATABLE +FileHTML_Rename=3D/model/FileHTML.html +# END NON-TRANSLATABLE + +##### Create File HTML ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileHTML=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileHTML.WindowTitle=3DNew File HTML +FileFolder_CreateFileHTML.Title=3DFile HTML + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileHTML=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileHTML.WindowTitle=3DNew File HTML +FileSystemFolder_CreateFileHTML.Title=3DFile HTML + +##### File XSL ##### + +# START NON-TRANSLATABLE +FileXSL=3D/model/FileXSL.html +# END NON-TRANSLATABLE + +# START NON-TRANSLATABLE +FileXSL_Properties=3D/model/FileProperty.html +# END NON-TRANSLATABLE +FileXSL_Properties.Title=3DFile XSL + +##### Create File XSL ##### + +# START NON-TRANSLATABLE +FileFolder_CreateFileXSL=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileFolder_CreateFileXSL.WindowTitle=3DNew File XSL + +# START NON-TRANSLATABLE +FileSystemFolder_CreateFileXSL=3D/model/CreateFile.html +# END NON-TRANSLATABLE +FileSystemFolder_CreateFileXSL.WindowTitle=3DNew File XSL + ##### Create CSS and JS File ##### = FileFolder_CreateFileCSS=3D/model/noHelpYet.html Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web= _ja.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web_ja.pr= operties 2009-09-18 09:15:20 UTC (rev 17648) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web_ja.pr= operties 2009-09-18 09:18:49 UTC (rev 17649) @@ -1,4 +1,26 @@ WebPrjAdoptStepName.web.xml_location=3Dweb.xml \u30ED\u30B1\u30FC\u30B7\u3= 0E7\u30F3 +FileJSP_Properties.Title=3DJSP \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileJSP.WindowTitle=3D\u65B0\u898F JSP \u30D5\u30A1\u30A4= \u30EB +FileFolder_CreateFileJSP.Title=3DJSP \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileJSP_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\u3= 0E9\u30EA\u30FC\u306E\u9078\u629E +FileSystemFolder_CreateFileJSP.WindowTitle=3D\u65B0\u898F JSP \u30D5\u30A1= \u30A4\u30EB +FileSystemFolder_CreateFileJSP.Title=3DJSP \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileJSP_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\u3= 0D6\u30E9\u30EA\u30FC\u306E\u9078\u629E +FileXHTML_Properties.Title=3DXHTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileXHTML.WindowTitle=3D\u65B0\u898F XHTML \u30D5\u30A1\u= 30A4\u30EB +FileFolder_CreateFileXHTML.Title=3DXHTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileXHTML_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\u30D6\= u30E9\u30EA\u30FC\u306E\u9078\u629E +FileSystemFolder_CreateFileXHTML.WindowTitle=3D\u65B0\u898F XHTML \u30D5\u= 30A1\u30A4\u30EB +FileSystemFolder_CreateFileXHTML.Title=3DXHTML \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileXHTML_1.Title=3D\u30BF\u30B0\u30FB\u30E9\u30A4\= u30D6\u30E9\u30EA\u30FC\u306E\u9078\u629E +FileHTML_Properties.Title=3DHTML \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileHTML.WindowTitle=3D\u65B0\u898F HTML \u30D5\u30A1\u30= A4\u30EB +FileFolder_CreateFileHTML.Title=3DHTML \u30D5\u30A1\u30A4\u30EB +FileSystemFolder_CreateFileHTML.WindowTitle=3D\u65B0\u898F HTML \u30D5\u30= A1\u30A4\u30EB +FileSystemFolder_CreateFileHTML.Title=3DHTML \u30D5\u30A1\u30A4\u30EB +FileXSL_Properties.Title=3DXSL \u30D5\u30A1\u30A4\u30EB +FileFolder_CreateFileXSL.WindowTitle=3D\u65B0\u898F XSL \u30D5\u30A1\u30A4= \u30EB +FileSystemFolder_CreateFileXSL.WindowTitle=3D\u65B0\u898F XSL \u30D5\u30A1= \u30A4\u30EB FileFolder_CreateFileCSS=3D/model/noHelpYet.html FileFolder_CreateFileCSS.WindowTitle=3D\u65B0\u898F CSS \u30D5\u30A1\u30A4= \u30EB FileFolder_CreateFileCSS.Title=3DCSS \u30D5\u30A1\u30A4\u30EB Added: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.= meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.met= a (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.met= a 2009-09-18 09:18:49 UTC (rev 17649) @@ -0,0 +1,438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --===============5052208901559764068==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 05:19:45 2009 Content-Type: multipart/mixed; boundary="===============3608161379740966875==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17650 - trunk/struts/plugins/org.jboss.tools.struts/resources/help. Date: Fri, 18 Sep 2009 05:19:45 -0400 Message-ID: <200909180919.n8I9JjW3032030@svn01.web.mwc.hst.phx2.redhat.com> --===============3608161379740966875== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 05:19:45 -0400 (Fri, 18 Sep 2009) New Revision: 17650 Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.p= roperties trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_j= a.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Definitions of model objects for jsp, html, xhtml moved to jst.web. Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-s= truts.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.= properties 2009-09-18 09:18:49 UTC (rev 17649) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts.= properties 2009-09-18 09:19:45 UTC (rev 17650) @@ -1022,4 +1022,16 @@ = #Wizard-Labels.end = +# START NON-TRANSLATABLE +JSPLinkRecognizer_CreateLink=3D/model/OptionsEditor.html +# END NON-TRANSLATABLE +JSPLinkRecognizer_CreateLink.WindowTitle=3DAdd Link Recognizer Rule +JSPLinkRecognizer_CreateLink.Title=3DLink Recognizer Rule = +# START NON-TRANSLATABLE +JSPLink_Edit=3D/model/OptionsEditor.html +# END NON-TRANSLATABLE +JSPLink_Edit.WindowTitle=3DEdit +JSPLink_Edit.Title=3DLink Recognizer Rule + + Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-s= truts_ja.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_= ja.properties 2009-09-18 09:18:49 UTC (rev 17649) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/help/keys-struts_= ja.properties 2009-09-18 09:19:45 UTC (rev 17650) @@ -59,3 +59,7 @@ StrutsGen11_Forwards_properties=3DGenerate JavaBeans properties StrutsGen11_Exceptions_base_class=3D\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u= 30B9 StrutsGen11_Exceptions_properties=3DGenerate JavaBeans properties +JSPLinkRecognizer_CreateLink.WindowTitle=3D\u30EA\u30F3\u30AF\u8A8D\u8B58\= u30EB\u30FC\u30EB\u306E\u8FFD\u52A0 +JSPLinkRecognizer_CreateLink.Title=3D\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\= u30FC\u30EB +JSPLink_Edit.WindowTitle=3D\u7DE8\u96C6 +JSPLink_Edit.Title=3D\u30EA\u30F3\u30AF\u8A8D\u8B58\u30EB\u30FC\u30EB --===============3608161379740966875==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 06:06:58 2009 Content-Type: multipart/mixed; boundary="===============5222623852595667104==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17651 - in trunk/jst/plugins/org.jboss.tools.jst.web: resources/meta and 3 other directories. Date: Fri, 18 Sep 2009 06:06:58 -0400 Message-ID: <200909181006.n8IA6w18009305@svn01.web.mwc.hst.phx2.redhat.com> --===============5222623852595667104== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 06:06:58 -0400 (Fri, 18 Sep 2009) New Revision: 17651 Added: trunk/jst/plugins/org.jboss.tools.jst.web/schema/ trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/mo= del/handlers/JSPCompoundAdopt.java Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/model/TLDUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-18 0= 9:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-18 1= 0:06:58 UTC (rev 17651) @@ -6,5 +6,6 @@ about.html,\ META-INF/,\ web.jar,\ - catalog/ + catalog/,\ + schema/ additional.bundles =3D org.eclipse.jem.util Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 09:19:4= 5 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 10:06:5= 8 UTC (rev 17651) @@ -1,6 +1,7 @@ + = @@ -33,7 +34,7 @@ = - + @@ -118,6 +119,8 @@ class=3D"org.jboss.tools.jst.web.model.handlers.FindReferringItemHandle= r"/> + @@ -143,7 +143,7 @@ @@ -233,7 +233,7 @@ Added: trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd 2009-09-= 18 10:06:58 UTC (rev 17651) @@ -0,0 +1,103 @@ + + + + + + + + + [Enter description of this extension point.] + + + + + + + + + + + + + + + + + = + + + + + + + = + + + + + + + = + + + + + + + + + + + + + + + Qualified name of class implementing interface + org.jboss.tools.common.meta.XAdoptManager + + + + + + + + + + + + + + + [Enter the first release in which this extension point appears.] + + + + + + + + + [Enter extension point usage example here.] + + + + + + + + + [Enter API information here.] + + + + + + + + + [Enter information about supplied implementation of this extensio= n point.] + + + + + Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAd= opt.exsd ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/model/handlers/JSPCompoundAdopt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/m= odel/handlers/JSPCompoundAdopt.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/m= odel/handlers/JSPCompoundAdopt.java 2009-09-18 10:06:58 UTC (rev 17651) @@ -0,0 +1,34 @@ +/*************************************************************************= ****** + * 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.model.handlers; + +import org.jboss.tools.common.meta.XAdoptManager; +import org.jboss.tools.common.meta.action.impl.CompoundAdoptManager; + +public class JSPCompoundAdopt extends CompoundAdoptManager { + /* + * see extension point org.jboss.tools.common.model.jspAdopt + private static String[] MANAGERS =3D {"org.jboss.tools.jst.web.tld.mod= el.handlers.JSPAdopt", + "org.jboss.tools.struts.tiles.mode= l.handlers.JSPAdopt", + "org.jboss.tools.struts.model.hand= lers.JSPAdopt", + "org.jboss.tools.jsf.model.handler= s.JSPAdopt", + "org.jboss.tools.jsf.ui.adopt.JSPA= dopt", + "org.jboss.tools.jst.web.model.han= dlers.JSPAdopt", + }; + */ + private static XAdoptManager[] managers =3D null; + + public XAdoptManager[] getManagers() { + if(managers =3D=3D null) managers =3D loadManagers("org.jboss.tool= s.jst.web.jspAdopt"); //$NON-NLS-1$ + return managers; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jbos= s/tools/jst/web/model/handlers/JSPCompoundAdopt.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst= /web/tld/model/TLDUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/model/TLDUtil.java 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/model/TLDUtil.java 2009-09-18 10:06:58 UTC (rev 17651) @@ -14,7 +14,7 @@ = public class TLDUtil { static String FILE_ENTITIES =3D ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.= FileTLD_2_1."; //$NON-NLS-1$ - static String TAG_ENTITIES =3D ".TLDTag.TLDTag12.TLDTag21."; //$NON-NL= S-1$ + static String TAG_ENTITIES =3D ".TLDTag.TLDTag12.TLDTag20.TLDTag21."; = //$NON-NLS-1$ static String ATTR_ENTITIES =3D ".TLDAttribute.TLDAttribute12."; //$NO= N-NLS-1$ = public static boolean isTaglib(XModelObject o) { --===============5222623852595667104==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 06:08:25 2009 Content-Type: multipart/mixed; boundary="===============8736722577428105471==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17652 - in trunk/common/plugins/org.jboss.tools.common.model: schema and 1 other directories. Date: Fri, 18 Sep 2009 06:08:25 -0400 Message-ID: <200909181008.n8IA8Pv3009517@svn01.web.mwc.hst.phx2.redhat.com> --===============8736722577428105471== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 06:08:24 -0400 (Fri, 18 Sep 2009) New Revision: 17652 Removed: trunk/common/plugins/org.jboss.tools.common.model/schema/jspAdopt.exsd trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/files/handlers/JSPAdopt.java Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/files/handlers/CreateFileSupport.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18= 10:06:58 UTC (rev 17651) +++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2009-09-18= 10:08:24 UTC (rev 17652) @@ -6,7 +6,6 @@ - @@ -130,8 +129,6 @@ class=3D"org.jboss.tools.common.model.engines.impl.EnginesLoader"/> - - - - - - - - - Registers class implementating interface = - org.jboss.tools.common.meta.XAdoptManager = - in class org.jboss.tools.common.model.files.handlers.JSPAdopt, = - which checks if a dragged model object can be dropped = - to *.jsp file and then executes the drop, delegating = - the check and execution to registered implementations. - - - - - - - - - - - - = - - - - - - - = - - - - - - - = - - - - - - - - - - - - Qualified name of class implementing interface - org.jboss.tools.common.meta.XAdoptManager - - - - - - - - - - - - - - - 2.0.0 - - - - - - - - - = - - - - - - - - - = - - - - - - - - - = - - - - - - - - - Red Hat, Inc - - - - Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/files/handlers/CreateFileSupport.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/files/handlers/CreateFileSupport.java 2009-09-18 10:06:58 UTC (= rev 17651) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/files/handlers/CreateFileSupport.java 2009-09-18 10:08:24 UTC (= rev 17652) @@ -25,6 +25,7 @@ import org.jboss.tools.common.meta.impl.XMetaDataConstants; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.filesystems.impl.*; +import org.jboss.tools.common.model.loaders.impl.MappedEntityRecognizer; import org.jboss.tools.common.model.plugin.ModelMessages; import org.jboss.tools.common.model.util.*; import org.jboss.tools.common.util.FileUtil; @@ -267,12 +268,19 @@ String entity =3D version =3D=3D null ? null : (String)versionEntities.= get(version); if(entity !=3D null) return entity; } - return ("jsp".equals(extension)) ? "FileJSP" : //$NON-NLS-1$ //$NON-NLS-= 2$ - ("htm".equals(extension)) ? "FileHTML" : //$NON-NLS-1$ //$NON-NLS-2$ - ("html".equals(extension)) ? "FileHTML" : //$NON-NLS-1$ //$NON-NLS-2$ - ("properties".equals(extension)) ? "FilePROPERTIES" : //$NON-NLS-1$ //$= NON-NLS-2$ - (extension.equals(action.getProperty(XModelObjectConstants.ATTR_NAME_EX= TENSION))) ? action.getProperty(XMetaDataConstants.ENTITY) : - "FileAny"; //$NON-NLS-1$ + = + String entity =3D null; + if(extension.equals(action.getProperty(XModelObjectConstants.ATTR_NAME_E= XTENSION))) { + entity =3D action.getProperty(XMetaDataConstants.ENTITY); + } + if(entity =3D=3D null) { + entity =3D new MappedEntityRecognizer().getEntityName(extension, null); + } + if(entity !=3D null && getTarget().getModel().getMetaData().getEntity(en= tity) !=3D null) { + return entity; + } + = + return "FileAny"; //$NON-NLS-1$ } = protected XModelObject modifyCreatedObject(XModelObject o) { Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/common/model/files/handlers/JSPAdopt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/files/handlers/JSPAdopt.java 2009-09-18 10:06:58 UTC (rev 17651) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/files/handlers/JSPAdopt.java 2009-09-18 10:08:24 UTC (rev 17652) @@ -1,35 +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.model.files.handlers; - -import org.jboss.tools.common.meta.*; -import org.jboss.tools.common.meta.action.impl.*; - -public class JSPAdopt extends CompoundAdoptManager { - /* - * see extension point org.jboss.tools.common.model.jspAdopt - private static String[] MANAGERS =3D {"org.jboss.tools.jst.web.tld.mod= el.handlers.JSPAdopt", - "org.jboss.tools.struts.tiles.mode= l.handlers.JSPAdopt", - "org.jboss.tools.struts.model.hand= lers.JSPAdopt", - "org.jboss.tools.jsf.model.handler= s.JSPAdopt", - "org.jboss.tools.jsf.ui.adopt.JSPA= dopt", - "org.jboss.tools.jst.web.model.han= dlers.JSPAdopt", - }; - */ - private static XAdoptManager[] managers =3D null; - - public XAdoptManager[] getManagers() { - if(managers =3D=3D null) managers =3D loadManagers("org.jboss.tool= s.common.model.jspAdopt"); //$NON-NLS-1$ - return managers; - } - -} - --===============8736722577428105471==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 06:09:22 2009 Content-Type: multipart/mixed; boundary="===============4031493208109520146==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17653 - trunk/jsf/plugins/org.jboss.tools.jsf. Date: Fri, 18 Sep 2009 06:09:22 -0400 Message-ID: <200909181009.n8IA9Mrn009659@svn01.web.mwc.hst.phx2.redhat.com> --===============4031493208109520146== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 06:09:22 -0400 (Fri, 18 Sep 2009) New Revision: 17653 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-18 10:08:24 UT= C (rev 17652) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-18 10:09:22 UT= C (rev 17653) @@ -27,7 +27,7 @@ = - + = --===============4031493208109520146==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 06:09:56 2009 Content-Type: multipart/mixed; boundary="===============4425154953574941785==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17654 - trunk/jsf/plugins/org.jboss.tools.jsf.ui. Date: Fri, 18 Sep 2009 06:09:55 -0400 Message-ID: <200909181009.n8IA9tVr009751@svn01.web.mwc.hst.phx2.redhat.com> --===============4425154953574941785== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 06:09:55 -0400 (Fri, 18 Sep 2009) New Revision: 17654 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2009-09-18 10:09:22= UTC (rev 17653) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2009-09-18 10:09:55= UTC (rev 17654) @@ -242,7 +242,7 @@ - + --===============0183052939688343899== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 06:10:35 -0400 (Fri, 18 Sep 2009) New Revision: 17655 Modified: trunk/struts/plugins/org.jboss.tools.struts/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/struts/plugins/org.jboss.tools.struts/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-18 10:09= :55 UTC (rev 17654) +++ trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-18 10:10= :35 UTC (rev 17655) @@ -30,7 +30,7 @@ - + --===============0183052939688343899==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 06:25:02 2009 Content-Type: multipart/mixed; boundary="===============5267750986784903494==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17656 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring. Date: Fri, 18 Sep 2009 06:25:02 -0400 Message-ID: <200909181025.n8IAP2CI012560@svn01.web.mwc.hst.phx2.redhat.com> --===============5267750986784903494== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2009-09-18 06:25:02 -0400 (Fri, 18 Sep 2009) New Revision: 17656 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRefactorSearcher.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRefactorSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-18 10:10:35 UTC = (rev 17655) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-18 10:25:02 UTC = (rev 17656) @@ -380,6 +380,10 @@ context.setElResolvers(resolvers); = List vars =3D ElVarSearcher.findAllVars(context, offset, resolver); + = + if(vars =3D=3D null) + continue; + = context.setVars(vars); = ELResolution resolution =3D resolver.resolve(context, operand); --===============5267750986784903494==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 06:32:52 2009 Content-Type: multipart/mixed; boundary="===============2163172632394878000==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17657 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: attribute/editor and 2 other directories. Date: Fri, 18 Sep 2009 06:32:52 -0400 Message-ID: <200909181032.n8IAWqbt014961@svn01.web.mwc.hst.phx2.redhat.com> --===============2163172632394878000== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 06:32:52 -0400 (Fri, 18 Sep 2009) New Revision: 17657 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/dnd/ControlDragDrop.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DropData.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Direct reference to palette adopt from jst.web removed. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 200= 9-09-18 10:25:02 UTC (rev 17656) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 200= 9-09-18 10:32:52 UTC (rev 17657) @@ -10,12 +10,21 @@ *************************************************************************= *****/ = package org.jboss.tools.common.model.ui.attribute.adapter; = +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.ListIterator; + import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jface.fieldassist.ContentProposalAdapter; +import org.eclipse.jface.fieldassist.IContentProposal; import org.eclipse.jface.fieldassist.IContentProposalProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposa= lProvider; +import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposa= l; +import org.eclipse.pde.internal.ui.editor.contentassist.TypePackageComplet= ionProcessor; +import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposal= Provider; @@ -56,3 +65,174 @@ } = } + + + +class TypeContentProposalProvider extends TypePackageCompletionProcessor i= mplements IContentProposalProvider { + public static final char F_DOT =3D '.'; + private IProject fProject; + private int fTypeScope; + private ArrayList fInitialContentProposals; + private String fInitialContent; + private Comparator fComparator; + + /** + * = + */ + public TypeContentProposalProvider(IProject project, int scope) { + fProject =3D project; + fTypeScope =3D scope; + fComparator =3D new TypeComparator(); + + reset(); + } + + /** + * TypeComparator + * + */ + private static class TypeComparator implements Comparator { + /** + * = + */ + public TypeComparator() { + // NO-OP + } + + /* (non-Javadoc) + * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) + */ + public int compare(Object arg0, Object arg1) { + String proposalSortKey1 =3D ((IContentProposal) arg0).getLabel(); + String proposalSortKey2 =3D ((IContentProposal) arg1).getLabel(); + return proposalSortKey1.compareToIgnoreCase(proposalSortKey2); + } + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposa= ls(java.lang.String, int) + */ + public IContentProposal[] getProposals(String contents, int position) { + // Generate a list of proposals based on the current contents + ArrayList currentContentProposals =3D null; + // Determine method to obtain proposals based on current field contents + if (position =3D=3D 0) { + // If the document offset is at the 0 position (i.e. no input entered), = + // do not perform content assist. The operation is too expensive = + // because all classes and interfaces (depending on the specified scope) + // will need to be resolved as proposals + currentContentProposals =3D null; + } else if ((fInitialContentProposals =3D=3D null) || (!contents.startsWi= th(fInitialContent)) || (endsWithDot(contents))) { + // Generate new proposals if the content assist session was just + // started + // Or generate new proposals if the current contents of the field + // is less than the initial contents of the field used to = + // generate the original proposals; thus, widening the search + // scope. This can occur when the user types backspace + // Or generate new proposals if the current contents ends with a + // dot + currentContentProposals =3D generateContentProposals(contents.substring= (0, position)); + } else { + // Filter existing proposals from a prevous search; thus, narrowing + // the search scope. This can occur when the user types additional + // characters in the field causing new characters to be appended to + // the initial field contents + currentContentProposals =3D filterContentProposals(contents); + } + + return convertResultsToSortedProposals(currentContentProposals); + } + + /** + * = + */ + public void reset() { + fInitialContentProposals =3D null; + } + + /* (non-Javadoc) + * @see org.eclipse.pde.internal.ui.editor.contentassist.TypePackageCompl= etionProcessor#addProposalToCollection(java.util.Collection, int, int, java= .lang.String, java.lang.String, org.eclipse.swt.graphics.Image) + */ + protected void addProposalToCollection(Collection collection, int startOf= fset, int length, String label, String content, Image image) { + // Create content proposals for field assist + // start offset and length not required + IContentProposal proposal =3D new TypeContentProposal(label, content, nu= ll, image); + // Add the proposal to the list of proposals + collection.add(proposal); + } + + /** + * @param string + * @return + */ + private boolean endsWithDot(String string) { + int index =3D string.lastIndexOf(F_DOT); + if ((index + 1) =3D=3D string.length()) { + return true; + } + return false; + } + + /** + * @param currentContent + * @return + */ + private ArrayList generateContentProposals(String currentContent) { + fInitialContentProposals =3D new ArrayList(); + // Store the initial field contents to determine if we need to + // widen the scope later + fInitialContent =3D currentContent; + generateTypePackageProposals(currentContent, fProject, fInitialContentPr= oposals, 0, fTypeScope, true); + return fInitialContentProposals; + } + + /** + * @param list + * @return + */ + private IContentProposal[] convertResultsToSortedProposals(ArrayList list= ) { + IContentProposal[] proposals =3D null; + if ((list !=3D null) && (list.size() !=3D 0)) { + // Convert the results array list into an array of completion + // proposals + proposals =3D (IContentProposal[]) list.toArray(new IContentProposal[li= st.size()]); + // Sort the proposals alphabetically + Arrays.sort(proposals, fComparator); + } else { + proposals =3D new IContentProposal[0]; + } + return proposals; + } + + /** + * @param currentContent + * @return + */ + private ArrayList filterContentProposals(String currentContent) { + String lowerCaseCurrentContent =3D currentContent.toLowerCase(); + ListIterator iterator =3D fInitialContentProposals.listIterator(); + // Maintain a list of filtered search results + ArrayList filteredContentProposals =3D new ArrayList(); + // Iterate over the initial search results + while (iterator.hasNext()) { + Object object =3D iterator.next(); + IContentProposal proposal =3D (IContentProposal) object; + String compareString =3D null; + if (lowerCaseCurrentContent.indexOf(F_DOT) =3D=3D -1) { + // Use only the type name + compareString =3D proposal.getLabel().toLowerCase(); + } else { + // Use the fully qualified type name + compareString =3D proposal.getContent().toLowerCase(); + } + // Filter out any proposal not matching the current contents + // except for the edge case where the proposal is identical to the + // current contents + if (compareString.startsWith(lowerCaseCurrentContent, 0)) { + filteredContentProposals.add(proposal); + } + } + return filteredContentProposals; + } + +} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java 2009-09-18 = 10:25:02 UTC (rev 17656) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/attribute/editor/JavaHyperlinkCellEditor.java 2009-09-18 = 10:32:52 UTC (rev 17657) @@ -14,14 +14,11 @@ import org.jboss.tools.common.model.ui.IValueChangeListener; import org.jboss.tools.common.model.ui.IValueProvider; import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapt= er; -import org.eclipse.jdt.core.*; -import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompl= etionProcessor; import org.eclipse.swt.widgets.*; import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.util.XModelObjectUtil; -import org.jboss.tools.common.model.ui.templates.ControlContentAssistHelpe= r; = public class JavaHyperlinkCellEditor extends DialogCellEditorEx = implements JavaHyperlinkCueLabelProvider.JavaClassHolder { @@ -73,15 +70,6 @@ // setChangeButtonText(JFaceResources.getString("openBrowse")); } = - IPackageFragmentRoot root =3D (project =3D=3D null) ? null : Java= Adapter.getInstance().getPackageFragmentRoot(project); - if (root !=3D null) { - JavaTypeCompletionProcessor contentAssistentProcessor =3D new JavaT= ypeCompletionProcessor(false, false); - IPackageFragment currentPackage =3D root.getPackageFragment("");= //$NON-NLS-1$ - contentAssistentProcessor.setPackageFragment(currentPackage); - Text text =3D getTextField(); - text.setData("JavaHyperlinkLineFieldEditor", this); //$NON-NL= S-1$ - ControlContentAssistHelper.createTextContentAssistant(getTextField(= ), contentAssistentProcessor, JavaHyperlinkCueLabelProvider.INSTANCE); - } } } = Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/dnd/ControlDragDrop.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/dnd/ControlDragDrop.java 2009-09-18 10:25:02 UTC (rev 176= 56) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/dnd/ControlDragDrop.java 2009-09-18 10:32:52 UTC (rev 176= 57) @@ -17,6 +17,7 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.*; +import org.jboss.tools.common.model.options.impl.PaletteAdopt; import org.jboss.tools.common.model.ui.navigator.TreeViewerDragDropProvide= r; = import org.jboss.tools.common.meta.XAdoptManager; @@ -31,12 +32,9 @@ static XAdoptManager paletteAdopt; = static { - try { - if(Platform.getBundle("org.jboss.tools.jst.web") !=3D null) { //$NON-NL= S-1$ - paletteAdopt =3D (XAdoptManager)ModelFeatureFactory.getInstance().crea= teFeatureInstance("org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt"); /= /$NON-NLS-1$ - } - } catch (ClassCastException e) { - ModelUIPlugin.getPluginLog().logError(e); + XAdoptManager[] ms =3D new PaletteAdopt().getManagers(); + if(ms !=3D null && ms.length > 0) { + paletteAdopt =3D ms[0]; = } } = Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DropData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropData.java 2009-09-18 10:25:02 UTC (rev 17= 656) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropData.java 2009-09-18 10:32:52 UTC (rev 17= 657) @@ -20,7 +20,6 @@ import org.w3c.dom.Node; = import org.jboss.tools.common.model.ui.editors.dnd.DropUtils.AttributeDesc= riptorValueProvider; -import org.jboss.tools.jst.web.tld.VpeTaglibManager; = public class DropData { = --===============2163172632394878000==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 07:59:51 2009 Content-Type: multipart/mixed; boundary="===============6590080263067712229==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17658 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search and 1 other directory. Date: Fri, 18 Sep 2009 07:59:51 -0400 Message-ID: <200909181159.n8IBxp3Y030268@svn01.web.mwc.hst.phx2.redhat.com> --===============6590080263067712229== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2009-09-18 07:59:51 -0400 (Fri, 18 Sep 2009) New Revision: 17658 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRefactorSearcher.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/s= earch/SeamELReferencesQueryParticipant.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 added search scope support Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRefactorSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-18 10:32:52 UTC = (rev 17657) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-18 11:59:51 UTC = (rev 17658) @@ -20,8 +20,10 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.search.IJavaSearchScope; import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner; import org.eclipse.jdt.ui.text.IJavaPartitions; import org.eclipse.jface.text.BadLocationException; @@ -79,6 +81,7 @@ protected IFile baseFile; protected String propertyName; protected IJavaElement javaElement; + protected IJavaSearchScope searchScope; = public SeamRefactorSearcher(IFile baseFile, String propertyName){ this.baseFile =3D baseFile; @@ -89,6 +92,10 @@ this(baseFile, propertyName); this.javaElement =3D javaElement; } + = + public void setSearchScope(IJavaSearchScope searchScope){ + this.searchScope =3D searchScope; + } = public void findELReferences(){ if(baseFile =3D=3D null) @@ -100,6 +107,9 @@ for (IProject project : projects) { if(project =3D=3D null) continue; = + if(!containsInSearchScope(project)) + continue; + = IJavaProject javaProject =3D EclipseResourceUtil.getJavaProject(project= ); = // searching java, xml and property files in source folders @@ -367,6 +377,17 @@ return methodName.startsWith(SET); } = + private boolean containsInSearchScope(IProject project){ + if(searchScope =3D=3D null) + return true; + IPath[] paths =3D searchScope.enclosingProjectsAndJars(); + for(IPath path : paths){ + if(path.equals(project.getFullPath())) + return true; + } + return false; + } + = private void resolve(IFile file, ELExpression operand, int offset, int le= ngth){ ELResolver[] resolvers =3D ELResolverFactoryManager.getInstance().getRes= olvers(file); = Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/search/SeamELReferencesQueryParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= search/SeamELReferencesQueryParticipant.java 2009-09-18 10:32:52 UTC (rev 1= 7657) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= search/SeamELReferencesQueryParticipant.java 2009-09-18 11:59:51 UTC (rev 1= 7658) @@ -51,6 +51,7 @@ String name =3D ELSearcher.getPropertyName(qs.getElement().getElementN= ame()); = searcher =3D new ELSearcher(requestor, qs.getElement(), file, name); + searcher.setSearchScope(qs.getScope()); = searcher.findELReferences(); } @@ -68,7 +69,7 @@ class ELSearcher extends SeamRefactorSearcher{ ISearchRequestor requestor; public ELSearcher(ISearchRequestor requestor, IJavaElement element, IFil= e file, String name){ - super(file, name, element); + super(file, name/*, element*/); this.requestor =3D requestor; } = --===============6590080263067712229==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 08:29:24 2009 Content-Type: multipart/mixed; boundary="===============1023303549108415309==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17659 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml. Date: Fri, 18 Sep 2009 08:29:24 -0400 Message-ID: <200909181229.n8ICTOPZ002946@svn01.web.mwc.hst.phx2.redhat.com> --===============1023303549108415309== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 08:29:24 -0400 (Fri, 18 Sep 2009) New Revision: 17659 Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/x= ml/XMLEntityResolver.java Log: https://jira.jboss.org/jira/browse/JBIDE-4909 Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/c= ommon/xml/XMLEntityResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= xml/XMLEntityResolver.java 2009-09-18 11:59:51 UTC (rev 17658) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/= xml/XMLEntityResolver.java 2009-09-18 12:29:24 UTC (rev 17659) @@ -79,14 +79,16 @@ public InputSource resolveEntity(String publicId, String systemId) = throws SAXException, java.io.IOException { InputSource source =3D null; - + boolean ok =3D false; if (publicId !=3D null) { String url =3D publicEntities.getProperty(publicId); if (url !=3D null) { source =3D new InputSource(url); source.setPublicId(publicId); + ok =3D true; } - } else if (systemId !=3D null) { + } + if (!ok && systemId !=3D null) { String url =3D systemEntities.getProperty(systemId); if (url !=3D null) { source =3D new InputSource(url); --===============1023303549108415309==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 08:42:33 2009 Content-Type: multipart/mixed; boundary="===============3197835168728813010==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17660 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4853 and 4 other directories. Date: Fri, 18 Sep 2009 08:42:33 -0400 Message-ID: <200909181242.n8ICgX9p005332@svn01.web.mwc.hst.phx2.redhat.com> --===============3197835168728813010== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2009-09-18 08:42:33 -0400 (Fri, 18 Sep 2009) New Revision: 17660 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4853/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4853/SelectAllAndCut.html trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/JsfAllTests.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= VisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html Log: RESOLVED - issue JBIDE-4853: AutoRefresh doesn't work after Select All and = source edit = https://jira.jboss.org/jira/browse/JBIDE-4853 - reverted back the changes of JBIDE-4816: Dump Source give us different r= esults before and after refresh - fixed JBIDE-4816 in an another way - written JUnit test for JBIDE-4853 = Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4853/SelectAllAndCut.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4853/SelectAllAndCut.html (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4853/SelectAllAndCut.html 2009-09-18 12:42:33 UTC (rev 1= 7660) @@ -0,0 +1 @@ +abc \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to= ols/jsf/vpe/jsf/test/JsfAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2009-09-18 12:29:24 UTC (rev 17659) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2009-09-18 12:42:33 UTC (rev 17660) @@ -76,6 +76,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectAllAndCut_JBIDE4853; import org.jboss.tools.jsf.vpe.jsf.test.jbide.VPERefreshTest; import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.ui.test.VpeTestSetup; @@ -102,6 +103,7 @@ suite.addTestSuite(Jsf20ComponentContentTest.class); suite.addTestSuite(JBIDE3519Test.class); suite.addTestSuite(ContextMenuDoubleInsertionTest_JBIDE3888.class); + suite.addTestSuite(SelectAllAndCut_JBIDE4853.class); suite.addTestSuite(JBIDE4037Test.class); suite.addTestSuite(JBIDE3734Test.class); suite.addTestSuite(JBIDE3617Test.class); @@ -188,7 +190,5 @@ projectToImport.add(jbide3247TestProject); = return new VpeTestSetup(suite, projectToImport); - } - } Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools= /jsf/vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/SelectAllAndCut_JBIDE4853.java 2009-09-18 12:42:33 UTC= (rev 17660) @@ -0,0 +1,53 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.eclipse.swt.custom.StyledText; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.mozilla.interfaces.nsIDOMDocument; + +/** + * Tests for JIRA issue JBIDE-4859: AutoRefresh doesn't work after = + * Select All and source edit. + * (https://jira.jboss.org/jira/browse/JBIDE-4859 ) + * = + * @author yradtsevich + */ +public class SelectAllAndCut_JBIDE4853 extends VpeTest { + private static final String TEST_PAGE_NAME + =3D "JBIDE/4853/SelectAllAndCut.html"; //$NON-NLS-1$ + private static final String CUT_ELEMENT_ID =3D "cut-div"; //$NON-NLS-1$ + + public SelectAllAndCut_JBIDE4853(String name) { + super(name); + } + + public void testSelectAllAndCut() throws Throwable { + VpeController vpeController =3D openInVpe(JsfAllTests.IMPORT_PROJECT_NAM= E, + TEST_PAGE_NAME); + StyledText textWidget =3D vpeController.getSourceEditor() + .getTextViewer().getTextWidget(); + = + textWidget.selectAll(); + textWidget.cut(); + TestUtil.waitForIdle(); + = + nsIDOMDocument document =3D vpeController.getXulRunnerEditor() + .getDOMDocument(); + assertNull("Element with id=3D'" + CUT_ELEMENT_ID //$NON-NLS-1$ + + "' has been cut, but still" //$NON-NLS-1$ + + " exists in the visual part.", //$NON-NLS-1$ + document.getElementById(CUT_ELEMENT_ID)); + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeVisualDomBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eVisualDomBuilder.java 2009-09-18 12:29:24 UTC (rev 17659) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eVisualDomBuilder.java 2009-09-18 12:42:33 UTC (rev 17660) @@ -251,11 +251,7 @@ nsIDOMNodeList children =3D getContentArea().getChildNodes(); long len =3D children.getLength(); for (long i =3D len - 1; i >=3D 0; i--) { - //added by Maksim Areshkau as fix for https://jira.jboss.org/jira/brows= e/JBIDE-4816 - //for XR-1.8 addes node in document and it's should be deleted - if(PSEUDO_ELEMENT.equalsIgnoreCase(children.item(i).getNodeName())) { - getContentArea().removeChild(children.item(i)); - } + getContentArea().removeChild(children.item(i)); } = if (sourceDocument !=3D null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2009-09-18 12:29:24 = UTC (rev 17659) +++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2009-09-18 12:42:33 = UTC (rev 17660) @@ -68,7 +68,6 @@ = = - = --===============3197835168728813010==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 09:27:39 2009 Content-Type: multipart/mixed; boundary="===============1426564069364306773==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17661 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar: format and 1 other directory. Date: Fri, 18 Sep 2009 09:27:39 -0400 Message-ID: <200909181327.n8IDRdhU011801@svn01.web.mwc.hst.phx2.redhat.com> --===============1426564069364306773== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2009-09-18 09:27:39 -0400 (Fri, 18 Sep 2009) New Revision: 17661 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/too= lbar/SplitToolBar.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/too= lbar/format/TextFormattingToolBar.java Log: RESOLVED - issue JBIDE-4735: Set items in expanded formatting tool bar into= Vertical position. = https://jira.jboss.org/jira/browse/JBIDE-4735 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/toolbar/SplitToolBar.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/SplitToolBar.java 2009-09-18 12:42:33 UTC (rev 17660) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/SplitToolBar.java 2009-09-18 13:27:39 UTC (rev 17661) @@ -22,9 +22,9 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.layout.RowData; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -97,8 +97,9 @@ * bounds, then it is partially hidden, and all * remaining tools are completely hidden. */ - if (!intersection.equals(toolBounds)) + if (!intersection.equals(toolBounds)) { break; + } i++; } = @@ -108,24 +109,48 @@ */ final Shell floatingShell =3D new Shell(coolBar.getShell(), SWT.ON_TOP); - floatingShell.setLayout(new GridLayout()); - final ToolBar floatingBar =3D new ToolBar(floatingShell, = - SWT.FLAT | SWT.WRAP); + FillLayout shellLayout =3D new FillLayout(SWT.VERTICAL); + shellLayout.marginHeight =3D 5; + shellLayout.marginWidth =3D 5; + shellLayout.spacing =3D 5; + = + floatingShell.setLayout(shellLayout); SelectionListener selectionListener =3D new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { floatingShell.dispose(); } }; + = + ToolBar floatingBar =3D null; for (int j =3D i; j < tools.length; j++) { - cloneToolItem(floatingBar, tools[j], selectionListener); + ToolItem tool =3D tools[j]; + int style =3D tool.getStyle(); + + if ((style & SWT.SEPARATOR) !=3D 0) { + Control control =3D tool.getControl(); + if (control instanceof Combo) { + cloneCombo(floatingShell, selectionListener, + (Combo) control); + } + } else { + if (floatingBar =3D=3D null) { + floatingBar =3D new ToolBar(floatingShell, = + SWT.FLAT | SWT.WRAP); + } + cloneItem(floatingBar, tool, selectionListener); + } } +// Point size =3D floatingBar.computeSize (300, SWT.DEFAULT); +// System.out.println(size); +// floatingBar.setSize (size); +// floatingBar.pack(); + floatingShell.pack(); = /* * Drop down the menu below the chevron, with the left edges * aligned. */ pt =3D coolBar.toDisplay(new Point(event.x, event.y)); - floatingShell.pack(); arrange(floatingShell, pt); floatingShell.setVisible(true); floatingShell.setFocus(); @@ -235,31 +260,30 @@ * Creates a copy of {@code item} in the {@code destBar} and * adds given {@code selectionListener} to the created control. */ - protected void cloneToolItem(ToolBar destBar, ToolItem item, + protected void cloneItem(ToolBar destBar, ToolItem item, SelectionListener selectionListener) { - int style =3D item.getStyle(); + ToolItem copiedItem =3D createToolItem(destBar, item.getStyle(), + item.getImage(), item.getToolTipText()); + copiedItem.setEnabled(item.getEnabled()); + copiedItem.setSelection(item.getSelection()); + copySelectionListeners(item, copiedItem); + copiedItem.addSelectionListener(selectionListener); + } = - if ((style & SWT.SEPARATOR) !=3D 0) { - Control control =3D item.getControl(); - if (control instanceof Combo) { - Combo combo =3D (Combo) control; - Combo copiedCombo =3D createComboToolItem(destBar, combo.getStyle(), - combo.getToolTipText(), - Arrays.asList(combo.getItems()), - combo.getSelectionIndex()); - copiedCombo.setEnabled(combo.getEnabled()); - copiedCombo.setVisible(combo.getVisible()); - copySelectionListeners(combo, copiedCombo); - copiedCombo.addSelectionListener(selectionListener); - } - } else { - ToolItem copiedItem =3D createToolItem(destBar, item.getStyle(), - item.getImage(), item.getToolTipText()); - copiedItem.setEnabled(item.getEnabled()); - copiedItem.setSelection(item.getSelection()); - copySelectionListeners(item, copiedItem); - copiedItem.addSelectionListener(selectionListener); - } + /** + * Creates a copy of {@code combo} in the {@code parent} and + * adds given {@code selectionListener} to the created control. + */ + protected void cloneCombo(Composite parent, + SelectionListener selectionListener, Combo combo) { + Combo copiedCombo =3D createCombo(parent, combo.getStyle(), + combo.getToolTipText(), + Arrays.asList(combo.getItems()), + combo.getSelectionIndex()); + copiedCombo.setEnabled(combo.getEnabled()); + copiedCombo.setVisible(combo.getVisible()); + copySelectionListeners(combo, copiedCombo); + copiedCombo.addSelectionListener(selectionListener); } = /** @@ -292,21 +316,22 @@ */ protected Combo createComboToolItem(ToolBar bar, int style, String toolTipText, List comboItems, int selectionIndex) { - Combo combo =3D createCombo(bar, style, comboItems); + Combo combo =3D createCombo(bar, style, + toolTipText, comboItems, selectionIndex); ToolItem sep =3D new ToolItem(bar, SWT.SEPARATOR); sep.setWidth(combo.getSize().x); - combo.setToolTipText(toolTipText); - combo.select(selectionIndex); sep.setControl(combo); = return combo; } = protected Combo createCombo(Composite parent, int style, - List comboItems) { + String toolTipText, List comboItems, int selectionIndex) { Combo combo =3D new Combo(parent, style); - combo.setLayoutData(new RowData()); +// combo.setLayoutData(new RowData()); combo.setItems(comboItems.toArray(new String[comboItems.size()])); + combo.setToolTipText(toolTipText); + combo.select(selectionIndex); combo.pack(); return combo; } @@ -343,3 +368,4 @@ return result; } } + Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/toolbar/format/TextFormattingToolBar.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/format/TextFormattingToolBar.java 2009-09-18 12:42:33 UTC (rev 17660) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/format/TextFormattingToolBar.java 2009-09-18 13:27:39 UTC (rev 17661) @@ -41,7 +41,10 @@ */ public class TextFormattingToolBar extends SplitToolBar { = - private static final String NORMAL_FONT =3D "Normal"; //$NON-NLS-1$ + private static final String NORMAL_BLOCK_FORMAT = + =3D "- Block Format -"; //$NON-NLS-1$ + private static final String NORMAL_FONT =3D "- Font Name -"; //$NON-NLS-1$ + private static final String NORMAL_SIZE =3D "- Font Size -"; //$NON-NLS-1$ = private static final String ID =3D "TEXT_FORMATTING_TOOLBAR"; //$NON-NLS-= 1$ = @@ -92,7 +95,7 @@ emptySeparator.setWidth(1); = List blockFormatItems =3D new ArrayList(); - blockFormatItems.add("Normal"); //$NON-NLS-1$ + blockFormatItems.add(NORMAL_BLOCK_FORMAT); blockFormatItems.add("Address"); //$NON-NLS-1$ // blockFormatItems.add("Numbered List"); // blockFormatItems.add("Bulleted List"); @@ -122,7 +125,7 @@ // itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); = List fontSizes =3D new ArrayList(); - fontSizes.add(NORMAL_FONT); + fontSizes.add(NORMAL_SIZE); for (int i =3D 1; i < 8; i++) { fontSizes.add(Integer.toString(i)); //$NON-NLS-1$ } --===============1426564069364306773==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 11:02:41 2009 Content-Type: multipart/mixed; boundary="===============2229495202726291199==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17662 - trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common. Date: Fri, 18 Sep 2009 11:02:41 -0400 Message-ID: <200909181502.n8IF2fHq027883@svn01.web.mwc.hst.phx2.redhat.com> --===============2229495202726291199== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: sdzmitrovich Date: 2009-09-18 11:02:38 -0400 (Fri, 18 Sep 2009) New Revision: 17662 Added: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleListener.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleManager.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleRuleContainer.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/ICSSViewListner.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/StyleAttribyteContainer.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/StyleContainer.java Removed: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSSelectionListener.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleManager.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleRuleContainer.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/StyleAttribyteContainer.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/StyleContainer.java Log: https://jira.jboss.org/jira/browse/JBIDE-4849 Deleted: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/= css/common/CSSSelectionListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSSelectionListener.java 2009-09-18 13:27:39 UTC (rev 17661) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSSelectionListener.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -1,103 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ - -package org.jboss.tools.jst.css.common; - -import org.eclipse.core.runtime.ListenerList; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.ui.INullSelectionListener; -import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PlatformUI; -import org.jboss.tools.jst.css.CssPlugin; - -public class CSSSelectionListener implements ISelectionListener { - - private static CSSSelectionListener instance; - - private ListenerList listeners =3D new ListenerList(); - - CSSStyleManager styleManager =3D new CSSStyleManager(); - - private CSSSelectionListener() { - } - - public synchronized static CSSSelectionListener getInstance() { - - if (instance =3D=3D null) { - instance =3D new CSSSelectionListener(); - } - return instance; - } - - public void addSelectionListener(ISelectionListener listener) { - - // if added the first listener start listing - if (listeners.size() =3D=3D 0) - startListening(); - - listeners.add(listener); - } - - public void removeSelectionListener(ISelectionListener listener) { - listeners.remove(listener); - - // if removed last listener start listing - if (listeners.size() =3D=3D 0) - stopListening(); - } - - private void startListening() { - PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getSelectionService().addPostSelectionListener(this); -// PlatformUI.getWorkbench().getActiveWorkbenchWindow() -// .getSelectionService().addSelectionListener(this); - } - - private void stopListening() { - PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getSelectionService().removePostSelectionListener(this); - // PlatformUI.getWorkbench().getActiveWorkbenchWindow() - // .getSelectionService().addSelectionListener(this); - - } - - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - - StyleContainer styleContainer =3D styleManager - .recognizeCSSStyle(selection); - - ISelection selectionToLiteners =3D null; - - if (styleContainer !=3D null) { - selectionToLiteners =3D new StructuredSelection(styleContainer); - } else { - selectionToLiteners =3D StructuredSelection.EMPTY; - } - - Object[] array =3D listeners.getListeners(); - for (int i =3D 0; i < array.length; i++) { - final ISelectionListener l =3D (ISelectionListener) array[i]; - if ((part !=3D null && selection !=3D null) - || l instanceof INullSelectionListener) { - - try { - l.selectionChanged(part, selectionToLiteners); - } catch (Exception e) { - CssPlugin.log(e.getLocalizedMessage()); - } - } - - } - - } -} Copied: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/c= ss/common/CSSStyleListener.java (from rev 17608, trunk/jst/plugins/org.jbos= s.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.jav= a) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleListener.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleListener.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -0,0 +1,195 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.jst.css.common; + +import org.eclipse.core.runtime.ListenerList; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IPartListener; +import org.eclipse.ui.ISelectionListener; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.views.contentoutline.ContentOutline; +import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; +import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; +import org.jboss.tools.jst.css.CssPlugin; + +public class CSSStyleListener implements ISelectionListener, INodeAdapter, + IPartListener { + + private static CSSStyleListener instance; + + private ListenerList listeners =3D new ListenerList(); + + private CSSStyleManager styleManager =3D new CSSStyleManager(); + + private StyleContainer currentStyle; + + private IWorkbenchPart currentPart; + + private CSSStyleListener() { + } + + public synchronized static CSSStyleListener getInstance() { + + if (instance =3D=3D null) { + instance =3D new CSSStyleListener(); + } + return instance; + } + + public void addSelectionListener(ICSSViewListner listener) { + + // if added the first listener start listing + if (listeners.size() =3D=3D 0) + startListening(); + + listeners.add(listener); + } + + public void removeSelectionListener(ICSSViewListner listener) { + listeners.remove(listener); + + // if removed last listener start listing + if (listeners.size() =3D=3D 0) + stopListening(); + } + + private void startListening() { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService() + .addPartListener(this); + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getSelectionService().addPostSelectionListener(this); + + // PlatformUI.getWorkbench().getActiveWorkbenchWindow() + // .getSelectionService().addSelectionListener(this); + } + + private void stopListening() { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService() + .removePartListener(this); + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getSelectionService().removePostSelectionListener(this); + // PlatformUI.getWorkbench().getActiveWorkbenchWindow() + // .getSelectionService().addSelectionListener(this); + + } + + public void selectionChanged(IWorkbenchPart part, ISelection selection) { + + StyleContainer newStyle =3D styleManager.recognizeCSSStyle(selection); + + if (isImportant(part) + && ((currentStyle =3D=3D null) || !(currentStyle.equals(newStyle)))) { + + disconnect(currentStyle); + connect(newStyle); + currentStyle =3D newStyle; + + ISelection selectionToLiteners =3D null; + + if (newStyle !=3D null) { + selectionToLiteners =3D new StructuredSelection(newStyle); + } else { + selectionToLiteners =3D StructuredSelection.EMPTY; + } + + Object[] array =3D listeners.getListeners(); + for (int i =3D 0; i < array.length; i++) { + final ICSSViewListner l =3D (ICSSViewListner) array[i]; + if ((part !=3D null) && (l !=3D currentPart) && (selection !=3D null))= { + + try { + l.selectionChanged(part, selectionToLiteners); + } catch (Exception e) { + CssPlugin.log(e.getLocalizedMessage()); + } + } + + } + + } + + } + + protected boolean isImportant(IWorkbenchPart part) { + if ((part instanceof IEditorPart) || (part instanceof ContentOutline)) + return true; + return false; + } + + private void connect(StyleContainer style) { + + if (style !=3D null) { + style.addNodeListener(this); + } + + } + + private void disconnect(StyleContainer style) { + if (style !=3D null) { + style.removeNodelListener(this); + } + } + + public boolean isAdapterForType(Object type) { + return type.equals(CSSStyleListener.class); + } + + public void notifyChanged(INodeNotifier notifier, int eventType, + Object changedFeature, Object oldValue, Object newValue, int pos) { + Object[] array =3D listeners.getListeners(); + for (int i =3D 0; i < array.length; i++) { + final ICSSViewListner l =3D (ICSSViewListner) array[i]; + + if (currentPart !=3D l) { + try { + l.styleChanged(currentStyle); + } catch (Exception e) { + CssPlugin.log(e.getLocalizedMessage()); + } + } + + } + + } + + public void partActivated(IWorkbenchPart part) { + currentPart =3D part; + Object[] array =3D listeners.getListeners(); + for (int i =3D 0; i < array.length; i++) { + final ICSSViewListner l =3D (ICSSViewListner) array[i]; + + if (l instanceof IPartListener) { + try { + ((IPartListener) l).partActivated(part); + } catch (Exception e) { + CssPlugin.log(e.getLocalizedMessage()); + } + } + } + } + + public void partBroughtToTop(IWorkbenchPart part) { + partActivated(part); + } + + public void partClosed(IWorkbenchPart part) { + } + + public void partDeactivated(IWorkbenchPart part) { + } + + public void partOpened(IWorkbenchPart part) { + } +} Deleted: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/= css/common/CSSStyleManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleManager.java 2009-09-18 13:27:39 UTC (rev 17661) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleManager.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -1,216 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.jst.css.common; - -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetA= dapter; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclarati= on; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; -import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuer= y; -import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.Text; -import org.w3c.dom.css.CSSStyleRule; -import org.w3c.dom.css.CSSStyleSheet; -import org.w3c.dom.css.ElementCSSInlineStyle; - -/** - * @author Sergey Dzmitrovich - * = - */ -public class CSSStyleManager { - - public static final String STYLE_TAG_NAME =3D "style"; //$NON-NLS-1$ - - public static final String STYLE_ATTRIBUTE_NAME =3D "style"; //$NON-NLS-1$ - - /** - * = - * @param selection - * @return - */ - public StyleContainer recognizeCSSStyle(ISelection selection) { - - StyleContainer container =3D null; - if (selection instanceof IStructuredSelection) { - - Object selectedObject =3D ((IStructuredSelection) selection) - .getFirstElement(); - - // if selected object is node in css file - if (selectedObject instanceof ICSSNode) { - - CSSStyleRule styleRule =3D getStyleRule((ICSSNode) selectedObject); - - if (styleRule !=3D null) - container =3D new CSSStyleRuleContainer(styleRule); - - } else if ((selectedObject instanceof Element) - || (selectedObject instanceof Attr)) { - - Element selectedElement =3D null; - - if (selectedObject instanceof Attr) - selectedElement =3D ((Attr) selectedObject).getOwnerElement(); - else - selectedElement =3D (Element) selectedObject; - - if (isSuitableElement(selectedElement)) { - - container =3D new StyleAttribyteContainer(selectedElement); - - } - } else if (selectedObject instanceof Text) { - - Text styleText =3D (Text) selectedObject; - - Node parentNode =3D styleText.getParentNode(); - - if ((parentNode !=3D null) - && STYLE_TAG_NAME.equalsIgnoreCase(parentNode - .getNodeName())) { - - int offset =3D getRelationalOffset(styleText, - ((ITextSelection) selection).getOffset()); - - CSSStyleSheet sheet =3D getSheet(parentNode); - - ICSSNode node =3D getNode(sheet, offset); - - CSSStyleRule styleRule =3D getStyleRule(node); - - if (styleRule !=3D null) { - container =3D new CSSStyleRuleContainer(styleRule); - } - } - } - } - return container; - } - - /** - * = - * @param styleContainer - * @return - */ - private CSSStyleSheet getSheet(Node styleContainer) { - - if (styleContainer instanceof INodeNotifier) { - - INodeNotifier notifier =3D (INodeNotifier) styleContainer; - - IStyleSheetAdapter adapter =3D (IStyleSheetAdapter) notifier - .getAdapterFor(IStyleSheetAdapter.class); - - if (adapter !=3D null) { - - return (CSSStyleSheet) adapter.getSheet(); - } - - } - return null; - } - - /** - * = - * @param sheet - * @param offset - * @return - */ - private ICSSNode getNode(CSSStyleSheet sheet, int offset) { - - ICSSModel model =3D ((ICSSDocument) sheet).getModel(); - - if (model !=3D null) - - return (ICSSNode) model.getIndexedRegion(offset); - - return null; - - } - - /** - * = - * @param element - * @return - */ - private boolean isSuitableElement(Element element) { - - if (element instanceof ElementCSSInlineStyle - && isAttributeAvailable(element, STYLE_TAG_NAME)) { - return true; - } - - return false; - } - - /** - * = - * @param node - * @return - */ - private CSSStyleRule getStyleRule(ICSSNode node) { - - while (node !=3D null) { - - if (node instanceof CSSStyleRule) - return (CSSStyleRule) node; - - node =3D node.getParentNode(); - } - - return null; - } - - /** - * = - * @param selection - * @param styleText - * @return - */ - private int getRelationalOffset(Node basicNode, int absoluteOffset) { - - return absoluteOffset - ((IndexedRegion) basicNode).getStartOffset(); - } - - = - /** - * @param element - * @param attrName - * @return - */ - private static boolean isAttributeAvailable(Element element, String attrN= ame) { - ModelQuery modelQuery =3D ModelQueryUtil.getModelQuery(element - .getOwnerDocument()); - if (modelQuery !=3D null) { - CMElementDeclaration decl =3D modelQuery - .getCMElementDeclaration(element); - if (decl !=3D null) { - CMNamedNodeMap map =3D decl.getAttributes(); - if ((CMAttributeDeclaration) map.getNamedItem(attrName) !=3D null) { - return true; - } - } - } - - return false; - } -} Copied: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/c= ss/common/CSSStyleManager.java (from rev 17608, trunk/jst/plugins/org.jboss= .tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleManager.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleManager.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -0,0 +1,216 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jst.css.common; + +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetA= dapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclarati= on; +import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; +import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; +import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuer= y; +import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; +import org.w3c.dom.Attr; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.Text; +import org.w3c.dom.css.CSSStyleRule; +import org.w3c.dom.css.CSSStyleSheet; +import org.w3c.dom.css.ElementCSSInlineStyle; + +/** + * @author Sergey Dzmitrovich + * = + */ +public class CSSStyleManager { + + public static final String STYLE_TAG_NAME =3D "style"; //$NON-NLS-1$ + + public static final String STYLE_ATTRIBUTE_NAME =3D "style"; //$NON-NLS-1$ + + /** + * = + * @param selection + * @return + */ + public StyleContainer recognizeCSSStyle(ISelection selection) { + + StyleContainer container =3D null; + if (selection instanceof IStructuredSelection) { + + Object selectedObject =3D ((IStructuredSelection) selection) + .getFirstElement(); + + // if selected object is node in css file + if (selectedObject instanceof ICSSNode) { + + CSSStyleRule styleRule =3D getStyleRule((ICSSNode) selectedObject); + + if (styleRule !=3D null) + container =3D new CSSStyleRuleContainer(styleRule); + + } else if ((selectedObject instanceof Element) + || (selectedObject instanceof Attr)) { + + Element selectedElement =3D null; + + if (selectedObject instanceof Attr) + selectedElement =3D ((Attr) selectedObject).getOwnerElement(); + else + selectedElement =3D (Element) selectedObject; + + if (isSuitableElement(selectedElement)) { + + container =3D new StyleAttribyteContainer(selectedElement); + + } + } else if ((selectedObject instanceof Text) + && (selection instanceof ITextSelection)) { + + Text styleText =3D (Text) selectedObject; + + Node parentNode =3D styleText.getParentNode(); + + if ((parentNode !=3D null) + && STYLE_TAG_NAME.equalsIgnoreCase(parentNode + .getNodeName())) { + + int offset =3D getRelationalOffset(styleText, + ((ITextSelection) selection).getOffset()); + + CSSStyleSheet sheet =3D getSheet(parentNode); + + ICSSNode node =3D getNode(sheet, offset); + + CSSStyleRule styleRule =3D getStyleRule(node); + + if (styleRule !=3D null) { + container =3D new CSSStyleRuleContainer(styleRule); + } + } + } + } + return container; + } + + /** + * = + * @param styleContainer + * @return + */ + private CSSStyleSheet getSheet(Node styleContainer) { + + if (styleContainer instanceof INodeNotifier) { + + INodeNotifier notifier =3D (INodeNotifier) styleContainer; + + IStyleSheetAdapter adapter =3D (IStyleSheetAdapter) notifier + .getAdapterFor(IStyleSheetAdapter.class); + + if (adapter !=3D null) { + + return (CSSStyleSheet) adapter.getSheet(); + } + + } + return null; + } + + /** + * = + * @param sheet + * @param offset + * @return + */ + private ICSSNode getNode(CSSStyleSheet sheet, int offset) { + + ICSSModel model =3D ((ICSSDocument) sheet).getModel(); + + if (model !=3D null) + + return (ICSSNode) model.getIndexedRegion(offset); + + return null; + + } + + /** + * = + * @param element + * @return + */ + private boolean isSuitableElement(Element element) { + + if (element instanceof ElementCSSInlineStyle + && isAttributeAvailable(element, STYLE_TAG_NAME)) { + return true; + } + + return false; + } + + /** + * = + * @param node + * @return + */ + private CSSStyleRule getStyleRule(ICSSNode node) { + + while (node !=3D null) { + + if (node instanceof CSSStyleRule) + return (CSSStyleRule) node; + + node =3D node.getParentNode(); + } + + return null; + } + + /** + * = + * @param selection + * @param styleText + * @return + */ + private int getRelationalOffset(Node basicNode, int absoluteOffset) { + + return absoluteOffset - ((IndexedRegion) basicNode).getStartOffset(); + } + + /** + * @param element + * @param attrName + * @return + */ + private static boolean isAttributeAvailable(Element element, String attrN= ame) { + ModelQuery modelQuery =3D ModelQueryUtil.getModelQuery(element + .getOwnerDocument()); + if (modelQuery !=3D null) { + CMElementDeclaration decl =3D modelQuery + .getCMElementDeclaration(element); + if (decl !=3D null) { + CMNamedNodeMap map =3D decl.getAttributes(); + if ((CMAttributeDeclaration) map.getNamedItem(attrName) !=3D null) { + return true; + } + } + } + + return false; + } +} Deleted: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/= css/common/CSSStyleRuleContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java 2009-09-18 13:27:39 UTC (rev 17661) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -1,75 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.jst.css.common; - -import java.util.HashMap; -import java.util.Map; - -import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.CSSStyleRule; - -/** - * @author Sergey Dzmitrovich - * = - */ -public class CSSStyleRuleContainer extends StyleContainer { - - private CSSStyleRule styleRule; - - public CSSStyleRuleContainer(CSSStyleRule styleRule) { - this.styleRule =3D styleRule; - } - - public void applyStyleAttributes(Map attributes) { - - final CSSStyleDeclaration declaration =3D styleRule.getStyle(); - - // set properties - - if (attributes !=3D null) { - - if ((attributes.size() =3D=3D 0) && (declaration.getLength() > 0)) { - declaration.setCssText(Constants.EMPTY); - } else { - for (final Map.Entry me : attributes.entrySet()) { - if ((me.getValue() =3D=3D null) - || (me.getValue().length() =3D=3D 0)) { - declaration.removeProperty(me.getKey()); - } else if (!me.getValue().equals( - declaration.getPropertyValue(me.getKey()))) { - declaration.setProperty(me.getKey(), me.getValue(), - Constants.EMPTY); - } - } - - } - } - - } - - public Map getStyleAttributes() { - CSSStyleDeclaration declaration =3D styleRule.getStyle(); - Map styleMap =3D new HashMap(); - for (int i =3D 0; i < declaration.getLength(); i++) { - String propperty =3D declaration.item(i); - String value =3D declaration.getPropertyValue(propperty); - styleMap.put(propperty, value); - } - - return styleMap; - } - - public Object getStyleObject() { - return styleRule; - } - -} Copied: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/c= ss/common/CSSStyleRuleContainer.java (from rev 17608, trunk/jst/plugins/org= .jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleRuleContain= er.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -0,0 +1,103 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jst.css.common; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDec= laration; +import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; +import org.w3c.dom.css.CSSStyleDeclaration; +import org.w3c.dom.css.CSSStyleRule; + +/** + * @author Sergey Dzmitrovich + * = + */ +public class CSSStyleRuleContainer extends StyleContainer { + + private CSSStyleRule styleRule; + + public CSSStyleRuleContainer(CSSStyleRule styleRule) { + this.styleRule =3D styleRule; + } + + public void applyStyleAttributes(Map attributes) { + + final CSSStyleDeclaration declaration =3D styleRule.getStyle(); + + // set properties + + if (attributes !=3D null) { + + if ((attributes.size() =3D=3D 0) && (declaration.getLength() > 0)) { + declaration.setCssText(Constants.EMPTY); + } else { + for (final Map.Entry me : attributes.entrySet()) { + if ((me.getValue() =3D=3D null) + || (me.getValue().length() =3D=3D 0)) { + declaration.removeProperty(me.getKey()); + } else if (!me.getValue().equals( + declaration.getPropertyValue(me.getKey()))) { + declaration.setProperty(me.getKey(), me.getValue(), + Constants.EMPTY); + } + } + + } + } + + } + + public Map getStyleAttributes() { + CSSStyleDeclaration declaration =3D styleRule.getStyle(); + Map styleMap =3D new HashMap(); + for (int i =3D 0; i < declaration.getLength(); i++) { + String propperty =3D declaration.item(i); + String value =3D declaration.getPropertyValue(propperty); + styleMap.put(propperty, value); + } + + return styleMap; + } + + public Object getStyleObject() { + return styleRule; + } + + @Override + public void addNodeListener(INodeAdapter adapter) { + ICSSStyleDeclaration declaration =3D (ICSSStyleDeclaration) styleRule + .getStyle(); + addNodeAdapter(declaration, adapter); + ICSSNodeList nodeList =3D declaration.getChildNodes(); + for (int i =3D 0; i < nodeList.getLength(); i++) { + addNodeAdapter(nodeList.item(i), adapter); + } + + } + + @Override + public void removeNodelListener(INodeAdapter adapter) { + + ICSSStyleDeclaration declaration =3D (ICSSStyleDeclaration) styleRule + .getStyle(); + removeNodeAdapter(declaration, adapter); + ICSSNodeList nodeList =3D declaration.getChildNodes(); + for (int i =3D 0; i < nodeList.getLength(); i++) { + removeNodeAdapter(nodeList.item(i), adapter); + } + + } + +} Added: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/cs= s/common/ICSSViewListner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/ICSSViewListner.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/ICSSViewListner.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -0,0 +1,9 @@ +package org.jboss.tools.jst.css.common; + +import org.eclipse.ui.ISelectionListener; + +public interface ICSSViewListner extends ISelectionListener { + + public void styleChanged(StyleContainer styleContainer); + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jbos= s/tools/jst/css/common/ICSSViewListner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/= css/common/StyleAttribyteContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleAttribyteContainer.java 2009-09-18 13:27:39 UTC (rev 17661) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleAttribyteContainer.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -1,79 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.jst.css.common; - -import java.util.HashMap; -import java.util.Map; - -import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSConstants; -import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; -import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; -import org.w3c.dom.Element; - -/** - * @author Sergey Dzmitrovich - * = - */ -public class StyleAttribyteContainer extends StyleContainer { - - public static final String STYLE_ATTRIBUTE_NAME =3D "style"; //$NON-NLS-1$ - - private Element element; - - public StyleAttribyteContainer(Element element) { - this.element =3D element; - } - - public void applyStyleAttributes(Map attributes) { - - StringBuffer buf =3D new StringBuffer(); - for (Map.Entry me : attributes.entrySet()) { - - if ((me.getValue() !=3D null) && (me.getValue().length() !=3D 0)) - buf.append(me.getKey() + Constants.COLON + me.getValue() - + Constants.SEMICOLON); - } - - element.setAttribute(STYLE_ATTRIBUTE_NAME, buf.toString()); - - } - - public Map getStyleAttributes() { - - String styleString =3D element.getAttribute(STYLE_ATTRIBUTE_NAME); - - Map styleMap =3D new HashMap(); - - if ((styleString !=3D null) && (styleString.length() > 0)) { - - String[] styles =3D styleString.split(Constants.SEMICOLON); - for (String styleElement : styles) { - String[] styleElementParts =3D styleElement.trim().split( - Constants.COLON); - if ((styleElementParts !=3D null) - && (styleElementParts.length =3D=3D 2) - && Util.searchInElement(styleElementParts[0], - CSSConstants.CSS_STYLES_MAP)) { - - styleMap.put(styleElementParts[0], styleElementParts[1]); - } - } - - } - - return styleMap; - } - - public Object getStyleObject() { - return element; - } - -} Copied: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/c= ss/common/StyleAttribyteContainer.java (from rev 17608, trunk/jst/plugins/o= rg.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleAttribyteCon= tainer.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleAttribyteContainer.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleAttribyteContainer.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -0,0 +1,92 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jst.css.common; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSConstants; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util; +import org.w3c.dom.Element; + +/** + * @author Sergey Dzmitrovich + * = + */ +public class StyleAttribyteContainer extends StyleContainer { + + public static final String STYLE_ATTRIBUTE_NAME =3D "style"; //$NON-NLS-1$ + + private Element element; + + public StyleAttribyteContainer(Element element) { + this.element =3D element; + } + + public void applyStyleAttributes(Map attributes) { + + StringBuffer buf =3D new StringBuffer(); + for (Map.Entry me : attributes.entrySet()) { + + if ((me.getValue() !=3D null) && (me.getValue().length() !=3D 0)) + buf.append(me.getKey() + Constants.COLON + me.getValue() + + Constants.SEMICOLON); + } + + element.setAttribute(STYLE_ATTRIBUTE_NAME, buf.toString()); + + } + + public Map getStyleAttributes() { + + String styleString =3D element.getAttribute(STYLE_ATTRIBUTE_NAME); + + Map styleMap =3D new HashMap(); + + if ((styleString !=3D null) && (styleString.length() > 0)) { + + String[] styles =3D styleString.split(Constants.SEMICOLON); + for (String styleElement : styles) { + String[] styleElementParts =3D styleElement.trim().split( + Constants.COLON); + if ((styleElementParts !=3D null) + && (styleElementParts.length =3D=3D 2) + && Util.searchInElement(styleElementParts[0], + CSSConstants.CSS_STYLES_MAP)) { + + styleMap.put(styleElementParts[0], styleElementParts[1]); + } + } + + } + + return styleMap; + } + + public Object getStyleObject() { + return element; + } + + @Override + public void addNodeListener(INodeAdapter adapter) { + addNodeAdapter(element, adapter); + = + } + + @Override + public void removeNodelListener(INodeAdapter adapter) { + removeNodeAdapter(element, adapter); + = + } + +} Deleted: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/= css/common/StyleContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleContainer.java 2009-09-18 13:27:39 UTC (rev 17661) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleContainer.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -1,33 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.jst.css.common; - -import java.util.Map; - -/** - * @author Sergey Dzmitrovich - * = - */ -public abstract class StyleContainer { - - public abstract Map getStyleAttributes(); - - public abstract void applyStyleAttributes(Map attributes); - - public abstract Object getStyleObject(); - - public boolean equals(Object obj) { - if (obj instanceof StyleContainer) - obj =3D ((StyleContainer) obj).getStyleObject(); - return getStyleObject().equals(obj); - } - -} Copied: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/c= ss/common/StyleContainer.java (from rev 17608, trunk/jst/plugins/org.jboss.= tools.jst.css/src/org/jboss/tools/jst/css/common/StyleContainer.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleContainer.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleContainer.java 2009-09-18 15:02:38 UTC (rev 17662) @@ -0,0 +1,53 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jst.css.common; + +import java.util.Map; + +import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; +import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; + +/** + * @author Sergey Dzmitrovich + * = + */ +public abstract class StyleContainer { + + public abstract Map getStyleAttributes(); + + public abstract void applyStyleAttributes(Map attributes); + + public abstract Object getStyleObject(); + + public boolean equals(Object obj) { + if (obj instanceof StyleContainer) + obj =3D ((StyleContainer) obj).getStyleObject(); + return getStyleObject().equals(obj); + } + + protected void addNodeAdapter(Object node, INodeAdapter adapter) { + + if (node instanceof INodeNotifier) + ((INodeNotifier) node).addAdapter(adapter); + + } + + protected void removeNodeAdapter(Object node, INodeAdapter adapter) { + if (node instanceof INodeNotifier) + ((INodeNotifier) node).removeAdapter(adapter); + + } + + public abstract void addNodeListener(INodeAdapter adapter); + + public abstract void removeNodelListener(INodeAdapter adapter); + +} --===============2229495202726291199==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 11:03:41 2009 Content-Type: multipart/mixed; boundary="===============4337180183344036909==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17663 - in trunk/jst/plugins/org.jboss.tools.jst.jsp: META-INF and 3 other directories. Date: Fri, 18 Sep 2009 11:03:41 -0400 Message-ID: <200909181503.n8IF3fOC028046@svn01.web.mwc.hst.phx2.redhat.com> --===============4337180183344036909== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 11:03:39 -0400 (Fri, 18 Sep 2009) New Revision: 17663 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/FileDropCommand.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/FileTagProposalLoader.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/JSPTagProposalFactory.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/PaletteDropCommand.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/TagProposal.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/JSPTextEditor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/DefaultDropCommandRunner.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Initial moving jsp related dnd to jst.jsp Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-= 18 15:02:38 UTC (rev 17662) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-= 18 15:03:39 UTC (rev 17663) @@ -16,6 +16,7 @@ org.jboss.tools.jst.jsp.editor, org.jboss.tools.jst.jsp.format, org.jboss.tools.jst.jsp.jspeditor, + org.jboss.tools.jst.jsp.jspeditor.dnd, org.jboss.tools.jst.jsp.messages, org.jboss.tools.jst.jsp.outline, org.jboss.tools.jst.jsp.outline.cssdialog, Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-18 15:02:3= 8 UTC (rev 17662) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-18 15:03:3= 9 UTC (rev 17663) @@ -396,6 +396,10 @@ class=3D"org.jboss.tools.jst.jsp.outline.VpeProperties"/> + + = extensionMap =3D new HashM= ap(); + = + static TagProposal[] IMG_TAG_PROPOSALS =3D new TagProposal[]{ + new TagProposal( + DropURI.JSF_HTML_URI, + "h", //$NON-NLS-1$ + "graphicImage", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("value","","") //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ + ), + new TagProposal( + DropURI.HTML_4_0_URI, + ITagProposal.EMPTY_PREFIX, + "img", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("src","","") //$NON-NLS-1$ //$= NON-NLS-2$ //$NON-NLS-3$ + ), + new TagProposal( + DropURI.STRUTS_HTML_URI, + "html", //$NON-NLS-1$ + "img", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-NLS-1$ //= $NON-NLS-2$ //$NON-NLS-3$ + ), + new TagProposal( + DropURI.SEAM_URI, + "s", //$NON-NLS-1$ + "graphicImage", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("url","","") //$NON-NLS-1$ //= $NON-NLS-2$ //$NON-NLS-3$ + ) +// yradtsevich: fix of JBIDE-3984: Exclude t:graphicImage option from Inse= rt tag dialog = +// , +// new TagProposal( +// DropURI.TOMOHAWK_URI, +// "t", +// "graphicImage", +// new AbsoluteFilePathAttributeValueLoader("url","","") +// ) + }; + = + static TagProposal[] CSS_TAG_PROPOSALS =3D new TagProposal[]{ + new TagProposal( + DropURI.HTML_4_0_URI, + ITagProposal.EMPTY_PREFIX, + "link", //$NON-NLS-1$ + new CssLinkAttributeValueLoader("href") //$NON-NLS-1$ + ), + }; + = + static TagProposal JSP_INCLUDE =3D new TagProposal( + DropURI.JSP_URI, + "jsp", //$NON-NLS-1$ + "include", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-NLS-= 1$ //$NON-NLS-2$ //$NON-NLS-3$ + ); + = + static TagProposal JSP_FORWARD =3D new TagProposal( + DropURI.JSP_URI, + "jsp", //$NON-NLS-1$ + "forward", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-NLS-1$ //$= NON-NLS-2$ //$NON-NLS-3$ + ); + = + static TagProposal UI_INCLUDE =3D new TagProposal( + PaletteTaglibInserter.faceletUri, + "ui", //$NON-NLS-1$ + "include", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("src","","") //$NON-NLS-1= $ //$NON-NLS-2$ //$NON-NLS-3$ + ); + = + static TagProposal S_DECORATE =3D new TagProposal( + DropURI.SEAM_URI, + "s", //$NON-NLS-1$ + "decorate", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("template","","") //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ); + = + static TagProposal[] PAGE_TAG_PROPOSALS =3D new TagProposal[]{ + JSP_INCLUDE, + JSP_FORWARD + }; + = + static TagProposal[] XHTML_PAGE_TAG_PROPOSALS =3D new TagProposal[]{ + JSP_INCLUDE, + JSP_FORWARD, + UI_INCLUDE, + S_DECORATE + }; + = + static { + // There is the question here what store HTML or TLD will been asked abo= ut TagDescription = + extensionMap.put("jpg", IMG_TAG_PROPOSALS); //$NON-NLS-1$ + + extensionMap.put("jpeg", IMG_TAG_PROPOSALS); //$NON-NLS-1$ + + extensionMap.put("gif",IMG_TAG_PROPOSALS); //$NON-NLS-1$ + = + extensionMap.put("bmp",IMG_TAG_PROPOSALS); //$NON-NLS-1$ + = + extensionMap.put("png",IMG_TAG_PROPOSALS); //$NON-NLS-1$ + = + extensionMap.put("jsp",PAGE_TAG_PROPOSALS); //$NON-NLS-1$ + extensionMap.put("html",PAGE_TAG_PROPOSALS); //$NON-NLS-1$ + extensionMap.put("xhtml",XHTML_PAGE_TAG_PROPOSALS); //$NON-NLS-1$ + + extensionMap.put( + "properties",new TagProposal[]{ //$NON-NLS-1$ + new TagProposal( + DropURI.JSF_CORE_URI, + "f", //$NON-NLS-1$ + "loadBundle", //$NON-NLS-1$ + new LoadBundleBaseNameAttributeValueLoader() + ) + } + ); + extensionMap.put("css",CSS_TAG_PROPOSALS); //$NON-NLS-1$ + extensionMap.put( + "inc", new TagProposal[]{ //$NON-NLS-1$ + new TagProposal( + DropURI.JSP_URI, + "jsp", //$NON-NLS-1$ + "include", //$NON-NLS-1$ + new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-N= LS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + ) + } + ); + + DropContext.mappedExtensions.addAll(extensionMap.keySet()); + } + = + public static boolean isExtensionMapped(String extension) { + return extension !=3D null && extensionMap.containsKey(extension.toLower= Case()); + } + = + public TagProposal[] getTagProposals(Object data) { + String fileName =3D data.toString(); + String extension =3D fileName.substring(fileName.lastIndexOf(".")+1); //= $NON-NLS-1$ + TagProposal[] tagProposals =3D (TagProposal[])extensionMap.get(extension= .toLowerCase()); + if(tagProposals=3D=3Dnull) { + tagProposals =3D new TagProposal[0]; + } + return tagProposals; + } + = + public boolean isTagProposalExists(Object data) { + return true; + } + + public static class ImageFileAttributesValuesLoader implements IAttribute= ValueLoader { + + public void fillTagAttributes(IDropWizardModel model) { + } + = + } + = + public static class JspFileAttributesValuesLoader implements IAttributeVa= lueLoader { + + public void fillTagAttributes(IDropWizardModel model) { + } + } +} \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/jspeditor/dnd/JSPTagProposalFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPTagProposalFactory.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPTagProposalFactory.java 2009-09-18 15:03:39 UTC (rev 17663) @@ -0,0 +1,58 @@ +/*************************************************************************= ****** + * 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.jsp.jspeditor.dnd; + +import java.util.HashMap; +import java.util.Map; + +import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory; +import org.jboss.tools.common.model.ui.editors.dnd.ITagProposalFactory; +import org.jboss.tools.common.model.ui.editors.dnd.ITagProposalLoader; + +public class JSPTagProposalFactory implements ITagProposalFactory { + private static final JSPTagProposalFactory INSTANCE =3D new JSPTagProposa= lFactory(); = + public static Map loaderMap =3D new HashMap= (); = + + static { + loaderMap.put(DropCommandFactory.kFileMime, FileTagProposalLoader.class.= getName()); + loaderMap.put(DropCommandFactory.kURLMime, FileTagProposalLoader.class.g= etName()); + new FileTagProposalLoader(); + } + = + public static JSPTagProposalFactory getInstance() { + return INSTANCE; + } + = + private JSPTagProposalFactory() { + } + = + public ITagProposalLoader getProposalLoader(String mimeType) { + ITagProposalLoader fInstance =3D DEFAULT_PROPOSAL_LOADER; + try { + String fClassName =3D (String)loaderMap.get(mimeType); + if(fClassName =3D=3D null) { + //No need to report, just there is no specific proposal loader for thi= s myme type. + return fInstance; + } + Class newClass =3D this.getClass().getClassLoader().loadClass(fClassNam= e); + fInstance =3D (ITagProposalLoader)newClass.newInstance(); + } catch (InstantiationException e) { + ModelUIPlugin.getPluginLog().logError(e); + } catch (IllegalAccessException e) { + ModelUIPlugin.getPluginLog().logError(e); + } catch (ClassNotFoundException e) { + ModelUIPlugin.getPluginLog().logError(e); + } + return fInstance; + } +} + Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/jspeditor/dnd/PaletteDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteDropCommand.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteDropCommand.java 2009-09-18 15:03:39 UTC (rev 17663) @@ -0,0 +1,335 @@ +/*************************************************************************= ****** + * 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.jsp.jspeditor.dnd; + +import java.util.Properties; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.wst.xml.core.internal.document.ElementImpl; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.options.PreferenceModelUtilities; +import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.ui.dnd.DnDUtil; +import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; +import org.jboss.tools.common.model.ui.editors.dnd.DropData; +import org.jboss.tools.common.model.ui.editors.dnd.DropWizard; +import org.jboss.tools.common.model.ui.editors.dnd.IDropWizard; +import org.jboss.tools.common.model.ui.editors.dnd.IDropWizardModel; +import org.jboss.tools.common.model.ui.editors.dnd.PaletteDropWizardModel; +import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributes= Composite.AttributeDescriptorValue; +import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.common.model.ui.views.palette.PaletteInsertManager; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.web.tld.IWebProject; +import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; +import org.jboss.tools.jst.web.tld.URIConstants; +import org.jboss.tools.jst.web.tld.WebProjectFactory; + +/** + * = + * @author eskimo + */ +public class PaletteDropCommand extends FileDropCommand { + Properties initialValues =3D new Properties(); + String startText; + String endText; = + String newLine; + String reformat =3D "no"; //$NON-NLS-1$ + + Properties properties =3D new Properties(); + boolean callPaletteWizard =3D false; + + /** + * = + */ + protected IDropWizardModel createSpecificModel() { + return new PaletteDropWizardModel(tagProposalFactory); + } + + protected void addCustomProperties(Properties runningProperties) { = + newLine =3D properties.getProperty(PaletteInsertHelper.PROPOPERTY_NEW_LI= NE); + if (newLine =3D=3D null) newLine=3D"true"; //$NON-NLS-1$ + runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_NEW_LINE, n= ewLine); + String addTaglib =3D properties.getProperty(PaletteInsertHelper.PROPOPER= TY_ADD_TAGLIB); + if(addTaglib =3D=3D null) addTaglib =3D "true"; //$NON-NLS-1$ + runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB,= addTaglib); + } + = + public void execute() { + if(getDefaultModel().getTagProposal() =3D=3D IDropWizardModel.UNDEFINED_= TAG_PROPOSAL) { + if(startText =3D=3D null && endText =3D=3D null) return; + int pos =3D ((ITextSelection)getDefaultModel().getDropData().getSelecti= onProvider().getSelection()).getOffset(); + getDefaultModel().getDropData().getSourceViewer().setSelectedRange(pos,= 0); + if(startText !=3D null) properties.setProperty(PaletteInsertHelper.PROP= OPERTY_START_TEXT, startText); + if(endText !=3D null) properties.setProperty(PaletteInsertHelper.PROPOP= ERTY_END_TEXT, endText); + if(reformat !=3D null) properties.setProperty(PaletteInsertHelper.PROPO= PERTY_REFORMAT_BODY, reformat); + if(newLine !=3D null) properties.setProperty(PaletteInsertHelper.PROPOP= ERTY_NEW_LINE, newLine); + PaletteInsertHelper.insertIntoEditor( + getDefaultModel().getDropData().getSourceViewer(), + properties + ); + } else { + DropData data =3D getDefaultModel().getDropData(); + ISourceViewer viewer =3D data.getSourceViewer(); + if(data.getContainer() !=3D null){ + if (data.getContainer() instanceof ElementImpl) { + ElementImpl container =3D (ElementImpl)data.getContainer(); + if(!container.hasEndTag()){ + try{ + IDocument document =3D viewer.getDocument(); + int containerOffset =3D container.getStartOffset(); + int containerLenght =3D container.getStartEndOffset()-containerOffs= et; + String containerString =3D document.get(containerOffset, containerL= enght); + int slashPosition =3D containerString.lastIndexOf("/"); //$NON-NLS-= 1$ + if(slashPosition >=3D 0){ + int deltaOffset =3D (containerString.length()-1)-slashPosition; + String text =3D ""; //$NON-NLS-1$ + for(int i=3D0; i < deltaOffset;i++) text +=3D " "; //$NON-NLS-1$ + text +=3D ">"; //$NON-NLS-1$ //$NON-= NLS-2$ + document.replace(containerOffset+slashPosition, containerString.le= ngth()-slashPosition, text); + } + }catch(BadLocationException ex){ + ModelUIPlugin.getPluginLog().logError(ex); + } + } + } + } = + super.execute(); + } + } + + public void initialize() { + DropData data =3D getDefaultModel().getDropData(); = + = + IEditorInput input =3D data.getEditorInput(); + XModelObject target =3D null; + IFile f =3D null; + if(input instanceof IFileEditorInput) { + f =3D ((IFileEditorInput)input).getFile(); + target =3D EclipseResourceUtil.getObjectByResource(f); + if(target =3D=3D null && f.exists()) { + target =3D EclipseResourceUtil.createObjectForResource(f); + } + } else if(input instanceof IModelObjectEditorInput) { + target =3D ((IModelObjectEditorInput)input).getXModelObject(); + } + if(target =3D=3D null) { + initialize2(); + } else { + ISourceViewer viewer =3D data.getSourceViewer(); + = + properties =3D new Properties(); + properties.put("viewer", viewer); //$NON-NLS-1$ + properties.setProperty("text", viewer.getDocument().get()); //$NON-NLS-= 1$ + properties.setProperty("isDrop", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + properties.setProperty("actionSourceGUIComponentID", "editor"); //$NON-= NLS-1$ //$NON-NLS-2$ + properties.setProperty("accepsAsString", "true"); //$NON-NLS-1$ //$NON-= NLS-2$ + = + if(f !=3D null) { + properties.put("file", f); //$NON-NLS-1$ + } + ISelection selection =3D data.getSelectionProvider().getSelection(); + = + int offset =3D 0; + //int length =3D 0; + if(selection instanceof ITextSelection) { + offset =3D ((ITextSelection)selection).getOffset(); + //length =3D ((ITextSelection)selection).getLength(); + } else { + offset =3D viewer.getTextWidget().getCaretOffset(); + } + properties.setProperty("pos", "" + offset); //$NON-NLS-1$ //$NON-NLS-2$ + if(selection instanceof IStructuredSelection && !selection.isEmpty()) { + Object so =3D ((IStructuredSelection)selection).getFirstElement(); + if(so instanceof IDOMElement) { + String en =3D ((IDOMElement)so).getNodeName(); + properties.setProperty("context:tagName", en); //$NON-NLS-1$ + String attrName =3D data.getAttributeName(); + if(attrName !=3D null) { + properties.setProperty("context:attrName", attrName); //$NON-NLS-1$ + } + } + } + try { + if(DnDUtil.isPasteEnabled(target)) { + DnDUtil.paste(target, properties); + } else { + XModelObject s =3D PreferenceModelUtilities.getPreferenceModel().getM= odelBuffer().source(); + if(s !=3D null) { + properties.setProperty("start text", "" + getDefaultText(s)); //$NON= -NLS-1$ //$NON-NLS-2$ + properties.setProperty("end text", ""); //$NON-NLS-1$ //$NON-NLS-2$ + properties.setProperty("new line", "newLine"); //$NON-NLS-1$ //$NON-= NLS-2$ + } + } + } catch (CoreException e) { + ModelUIPlugin.getPluginLog().logError(e); + } + startText =3D properties.getProperty(TLDToPaletteHelper.START_TEXT); + endText =3D properties.getProperty(TLDToPaletteHelper.END_TEXT); + reformat =3D properties.getProperty(TLDToPaletteHelper.REFORMAT); + String uri =3D properties.getProperty(URIConstants.LIBRARY_URI); + String libraryVersion =3D properties.getProperty(URIConstants.LIBRARY_V= ERSION); + String defaultPrefix =3D properties.getProperty(URIConstants.DEFAULT_PR= EFIX); + String tagname =3D properties.getProperty("tag name"); //$NON-NLS-1$ + = + callPaletteWizard =3D PaletteInsertManager.getInstance().getWizardName(= properties) !=3D null; + = + boolean isWizardEnabled =3D (!"FileJAVA".equals(target.getModelEntity()= .getName())); //$NON-NLS-1$ + if(getDefaultModel() instanceof PaletteDropWizardModel) { + ((PaletteDropWizardModel)getDefaultModel()).setWizardEnabled(isWizardE= nabled); + } + = + if(uri =3D=3D null || tagname =3D=3D null) { + getDefaultModel().setTagProposal(IDropWizardModel.UNDEFINED_TAG_PROPOS= AL); + } else { + getDefaultModel().setTagProposal(new TagProposal(uri, libraryVersion, = defaultPrefix, tagname)); + insertInitialValues(); + } + } = + } + + private void initialize2() { + XModelObject object =3D PreferenceModelUtilities.getPreferenceModel().ge= tModelBuffer().source(); + String tagname =3D object.getAttributeValue("name"); //$NON-NLS-1$ + XModelObject parent =3D object.getParent(); + String uri =3D (parent =3D=3D null) ? "" : parent.getAttributeValue(URIC= onstants.LIBRARY_URI); //$NON-NLS-1$ + String libraryVersion =3D (parent =3D=3D null) ? "" : parent.getAttribut= eValue(URIConstants.LIBRARY_VERSION); //$NON-NLS-1$ + String defaultPrefix =3D (parent =3D=3D null) ? "" : parent.getAttribute= Value(URIConstants.DEFAULT_PREFIX); //$NON-NLS-1$ + this.getDefaultModel().setTagProposal(new TagProposal(uri, libraryVersio= n,defaultPrefix,tagname)); + startText =3D object.getAttributeValue("start text"); //$NON-NLS-1$ + endText =3D object.getAttributeValue("end text"); //$NON-NLS-1$ + } + = + private void insertInitialValues() { + parseInitialValues(startText); + AttributeDescriptorValue[] vs =3D getDefaultModel().getAttributeValueDes= criptors(); + for (int i =3D 0; i < vs.length; i++) { + String v =3D initialValues.getProperty(vs[i].getName()); + if(v !=3D null) vs[i].setValue(v); + } + } + = + private void parseInitialValues(String startText) { + if(startText =3D=3D null || startText.length() =3D=3D 0) return; + int bi =3D startText.indexOf('<'); + if(bi < 0) return; + int ei =3D startText.indexOf('>', bi); + if(ei < 0) return; + String header =3D startText.substring(bi + 1, ei); + int NOTHING =3D 0; + int ATT_NAME =3D 1; + int ATT_VALUE =3D 2; + char quote =3D '\0'; + int state =3D NOTHING; + String name =3D null; + String value =3D null; + for (int i =3D 0; i < header.length(); i++) { + char c =3D header.charAt(i); + if(state =3D=3D NOTHING) { + if(Character.isJavaIdentifierStart(c)) { + name =3D "" + c; //$NON-NLS-1$ + state =3D ATT_NAME; + } + } else if(state =3D=3D ATT_NAME) { + if(Character.isJavaIdentifierPart(c) || c =3D=3D ':') { + name +=3D c; + } else if(c =3D=3D '=3D') { + state =3D ATT_VALUE; + quote =3D '\0'; + } + } else if(state =3D=3D ATT_VALUE) { + if(c =3D=3D quote) { + initialValues.setProperty(name, value); + name =3D null; + value =3D null; + state =3D NOTHING; + quote =3D '\0'; + } else if(c =3D=3D '"' || c =3D=3D '\'') { + quote =3D c; + value =3D ""; //$NON-NLS-1$ + } else if(quote !=3D '\0') { + value +=3D c; + } + } + } + } = + + protected String generateStartText() { + startText =3D properties.getProperty("start text"); //$NON-NLS-1$ + if(getDefaultModel().getTagProposal()=3D=3DIDropWizardModel.UNDEFINED_TA= G_PROPOSAL + || getDefaultModel().getTagProposal().getDetails().length() =3D=3D 0) { + return startText; + } + String s1 =3D super.generateStartText(); + String s2 =3D startText; + if(s2 =3D=3D null) return s1; + if(s1.indexOf('=3D') < 0) return s2; // no input + int bi1 =3D s1.indexOf('<'); + int bi2 =3D s2.indexOf('<'); + if(bi2 < 0 || bi1 < 0) return s2; + int ei1 =3D s1.indexOf('>', bi1); + int ei2 =3D s2.indexOf('>', bi2); + if(ei1 < 0 || ei2 < 0) return s1; + boolean slash1 =3D s1.charAt(ei1 - 1) =3D=3D '/'; + boolean slash2 =3D s2.charAt(ei2 - 1) =3D=3D '/'; + if(slash1 && !slash2) { + s2 =3D s2.substring(0, bi2) + s1.substring(bi1, ei1 - 1) + s2.substring= (ei2); + } else if(!slash1 && slash2) { + s2 =3D s2.substring(0, bi2) + s1.substring(bi1, ei1) + s2.substring(ei2= - 1); + } else { + s2 =3D s2.substring(0, bi2) + s1.substring(bi1, ei1) + s2.substring(ei2= ); + } + return s2; + } + + protected String generateEndText() { + endText =3D properties.getProperty("end text"); //$NON-NLS-1$ + return (endText !=3D null) ? endText : ""; //$NON-NLS-1$ + } + + protected String getReformatBodyProperty() { + return reformat; + } + + protected IDropWizard createDropWizard() { + String wizardName =3D PaletteInsertManager.getInstance().getWizardName(p= roperties); + = + IDropWizard wizard =3D null; + if(wizardName !=3D null) { + wizard =3D (IDropWizard)PaletteInsertManager.getInstance().createWizard= Instance(properties); + } + if(wizard =3D=3D null) wizard =3D new DropWizard(); + wizard.setCommand(this); + return wizard; + } + = + public Properties getProperties() { + return properties; + } + = + private String getDefaultText(XModelObject o) { + if(o =3D=3D null) return ""; //$NON-NLS-1$ + if(o.getFileType() !=3D XModelObject.FILE) return o.getPresentationStrin= g(); + IWebProject p =3D WebProjectFactory.instance.getWebProject(o.getModel()); + String path =3D p.getPathInWebRoot(o); + return path =3D=3D null ? o.getPresentationString() : path; + } +} \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/jspeditor/dnd/TagProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/TagProposal.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/TagProposal.java 2009-09-18 15:03:39 UTC (rev 17663) @@ -0,0 +1,107 @@ +/*************************************************************************= ****** + * 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.jsp.jspeditor.dnd; + +import org.jboss.tools.common.model.ui.editors.dnd.IAttributeValueLoader; +import org.jboss.tools.common.model.ui.editors.dnd.IDropWizardModel; +import org.jboss.tools.common.model.ui.editors.dnd.ITagProposal; + +public class TagProposal implements ITagProposal { + = + public static final String EMPTY_URI =3D ""; //$NON-NLS-1$ + = + String uri; + String libraryVersion =3D ""; //$NON-NLS-1$ + String prefix; + String name; + IAttributeValueLoader attributeValueLoader =3D EMPTY_ATTRIBUTE_VALUE_LOA= DER; + = + /** + * TagProposal with empty attribute value loader = + * + */ + public TagProposal( + String uri, = + String prefix, = + String name + ) { + this(uri, "", prefix, name); //$NON-NLS-1$ + } + + public TagProposal( + String uri, + String libraryVersion, + String prefix, = + String name + ) { + this.uri =3D uri; + this.libraryVersion =3D (libraryVersion =3D=3D null) ? "" : libraryVers= ion; //$NON-NLS-1$ + this.prefix =3D prefix; + this.name =3D name; + } + + /** + * = + * + */ + public TagProposal( + String uri, = + String prefix, = + String name, + IAttributeValueLoader loader + ) { + this.uri =3D uri; + this.prefix =3D prefix; + this.name =3D name; + this.attributeValueLoader =3D loader; + } + = + /** + * = + * @return + */ + public String getName() { + return name; + } + = + /** + * = + * @return + */ + public String getPrefix() { + return prefix; + } + + /** + * = + * @return + */ + public String getUri() { + return uri; + } + = + public String getLibraryVersion() { + return libraryVersion; + } + = + public IAttributeValueLoader getAttributesValueLoader() { + return attributeValueLoader; + } + + public String getDisplayString() { + return getPrefix() =3D=3D ITagProposal.EMPTY_PREFIX ? getName() : getPre= fix() + ":" + getName(); //$NON-NLS-1$ + } + + public String getDetails() { + return getUri(); + } + +} Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/DefaultDropCommandRunner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/DefaultDropCommandRunner.java 2009-09-18 15:02:38 UTC (rev 17662) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/DefaultDropCommandRunner.java 2009-09-18 15:03:39 UTC (rev 17663) @@ -24,8 +24,8 @@ import org.jboss.tools.common.meta.action.SpecialWizard; import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory; import org.jboss.tools.common.model.ui.editors.dnd.DropData; -import org.jboss.tools.common.model.ui.editors.dnd.JSPTagProposalFactory; import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory; = public class DefaultDropCommandRunner implements SpecialWizard { String flavor; --===============4337180183344036909==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 11:03:48 2009 Content-Type: multipart/mixed; boundary="===============4395683345521771869==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17664 - in trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css: view and 1 other directory. Date: Fri, 18 Sep 2009 11:03:48 -0400 Message-ID: <200909181503.n8IF3mJX028072@svn01.web.mwc.hst.phx2.redhat.com> --===============4395683345521771869== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: sdzmitrovich Date: 2009-09-18 11:03:45 -0400 (Fri, 18 Sep 2009) New Revision: 17664 Removed: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/pr= operties/TypeMapper.java Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/pr= operties/CSSPropertyPage.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/vi= ew/CSSEditorView.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/vi= ew/CSSPreview.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/properties/CSSPropertyPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/p= roperties/CSSPropertyPage.java 2009-09-18 15:03:39 UTC (rev 17663) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/p= roperties/CSSPropertyPage.java 2009-09-18 15:03:45 UTC (rev 17664) @@ -99,6 +99,8 @@ || (!selectedObject.equals(newSelectedObject))) super.selectionChanged(part, selection); selectedObject =3D newSelectedObject; + = + update(); = } = Deleted: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/= css/properties/TypeMapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/p= roperties/TypeMapper.java 2009-09-18 15:03:39 UTC (rev 17663) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/p= roperties/TypeMapper.java 2009-09-18 15:03:45 UTC (rev 17664) @@ -1,44 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ - -package org.jboss.tools.jst.css.properties; - -import org.eclipse.ui.views.properties.tabbed.ITypeMapper; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRul= e; - -/** - * @author Sergey Dzmitrovich - * = - */ -public class TypeMapper implements ITypeMapper { - - /* - * (non-Javadoc) - * = - * @see - * org.eclipse.ui.views.properties.tabbed.ITypeMapper#mapType(java.lang. - * Object) - */ - public Class mapType(Object object) { - - while (object instanceof ICSSNode) { - if ((object instanceof ICSSStyleRule) - || (((ICSSNode) object).getParentNode() =3D=3D null)) { - break; - } else { - object =3D ((ICSSNode) object).getParentNode(); - } - } - return object.getClass(); - } - -} Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/view/CSSEditorView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/v= iew/CSSEditorView.java 2009-09-18 15:03:39 UTC (rev 17663) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/v= iew/CSSEditorView.java 2009-09-18 15:03:45 UTC (rev 17664) @@ -11,24 +11,27 @@ = package org.jboss.tools.jst.css.view; = -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IViewSite; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.IContributedContentsView; import org.eclipse.ui.part.IPageBookViewPage; +import org.eclipse.ui.views.contentoutline.ContentOutline; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.PropertySheet; import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageCont= ributor; -import org.jboss.tools.jst.css.common.CSSSelectionListener; +import org.jboss.tools.jst.css.common.CSSStyleListener; +import org.jboss.tools.jst.css.common.ICSSViewListner; +import org.jboss.tools.jst.css.common.StyleContainer; import org.jboss.tools.jst.css.properties.CSSPropertyPage; = /** * @author Sergey Dzmitrovich * = */ -public class CSSEditorView extends PropertySheet { +public class CSSEditorView extends PropertySheet implements ICSSViewListne= r { = static public String CONTRIBUTOR_ID =3D "org.eclipse.wst.css.core.csssour= ce.source"; //$NON-NLS-1$ = @@ -37,33 +40,22 @@ = super.init(site); getSite().getPage().removeSelectionListener(this); - CSSSelectionListener.getInstance().addSelectionListener(this); + CSSStyleListener.getInstance().addSelectionListener(this); } = @Override public void dispose() { = super.dispose(); - CSSSelectionListener.getInstance().removeSelectionListener(this); + CSSStyleListener.getInstance().removeSelectionListener(this); = } = @Override - public void selectionChanged(IWorkbenchPart part, ISelection sel) { - super.selectionChanged(part, sel); - - // TODO find better way to react upon changing of node i source editor. - // Description of problem: when node is been editing PropertySheet will - // not send selection event to page as selection is same; - if (getCurrentPage() instanceof CSSPropertyPage) - ((CSSPropertyPage) getCurrentPage()).update(); - } - - @Override protected PageRec doCreatePage(final IWorkbenchPart part) { - if (part instanceof PropertySheet) { - return null; - } + // if (part instanceof PropertySheet) { + // return null; + // } IPropertySheetPage page =3D new CSSPropertyPage( new ITabbedPropertySheetPageContributor() { = @@ -102,4 +94,16 @@ } return super.getAdapter(key); } + + public void styleChanged(StyleContainer styleContainer) { + if (getCurrentPage() instanceof CSSPropertyPage) + ((CSSPropertyPage) getCurrentPage()).update(); + + } + @Override + protected boolean isImportant(IWorkbenchPart part) { + if ((part instanceof IEditorPart) || (part instanceof ContentOutline)) + return true; + return false; + } } Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/view/CSSPreview.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/v= iew/CSSPreview.java 2009-09-18 15:03:39 UTC (rev 17663) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/v= iew/CSSPreview.java 2009-09-18 15:03:45 UTC (rev 17664) @@ -11,6 +11,7 @@ = package org.jboss.tools.jst.css.view; = +import java.util.Collections; import java.util.HashMap; import java.util.Map; = @@ -27,12 +28,12 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IViewSite; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ViewPart; -import org.jboss.tools.jst.css.common.CSSSelectionListener; +import org.jboss.tools.jst.css.common.CSSStyleListener; +import org.jboss.tools.jst.css.common.ICSSViewListner; import org.jboss.tools.jst.css.common.StyleContainer; import org.jboss.tools.jst.css.messages.CSSUIMessages; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; @@ -41,7 +42,7 @@ * @author Sergey Dzmitrovich * = */ -public class CSSPreview extends ViewPart implements ISelectionListener { +public class CSSPreview extends ViewPart implements ICSSViewListner { = private Browser browser; = @@ -57,13 +58,13 @@ public void init(IViewSite site) throws PartInitException { super.init(site); = - CSSSelectionListener.getInstance().addSelectionListener(this); + CSSStyleListener.getInstance().addSelectionListener(this); } = @Override public void dispose() { = - CSSSelectionListener.getInstance().removeSelectionListener(this); + CSSStyleListener.getInstance().removeSelectionListener(this); super.dispose(); } = @@ -155,23 +156,19 @@ public void selectionChanged(IWorkbenchPart part, ISelection selection) { = if (selection instanceof IStructuredSelection) { + Map newAttributes; IStructuredSelection structuredSelection =3D (IStructuredSelection) sel= ection; if (structuredSelection.getFirstElement() instanceof StyleContainer) { = - styleAttributes =3D ((StyleContainer) structuredSelection + newAttributes =3D ((StyleContainer) structuredSelection .getFirstElement()).getStyleAttributes(); = } else { - styleAttributes.clear(); + newAttributes =3D Collections.EMPTY_MAP; } = - String newStyle =3D getStyle(styleAttributes); - if (!newStyle.equals(currentStyle)) { + updateView(newAttributes); = - currentStyle =3D newStyle; - updateBrowser(); - } - } = } @@ -196,4 +193,17 @@ public String getCurrentStyle() { return currentStyle; } + + public void styleChanged(StyleContainer styleContainer) { + updateView(styleContainer.getStyleAttributes()); + + } + + protected void updateView(Map attributes) { + + this.styleAttributes =3D attributes; + this.currentStyle =3D getStyle(attributes); + updateBrowser(); + + } } --===============4395683345521771869==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 11:06:20 2009 Content-Type: multipart/mixed; boundary="===============6174360321477397825==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17665 - in trunk/common/plugins/org.jboss.tools.common.model.ui: src/org/jboss/tools/common/model/ui/editors/dnd and 2 other directories. Date: Fri, 18 Sep 2009 11:06:19 -0400 Message-ID: <200909181506.n8IF6JVs029108@svn01.web.mwc.hst.phx2.redhat.com> --===============6174360321477397825== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 11:06:17 -0400 (Fri, 18 Sep 2009) New Revision: 17665 Added: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/ITagProposal.java Removed: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DefaultDropCommandRunner.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/FileDropCommand.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/FileTagProposalLoader.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/JSPTagProposalFactory.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/PaletteDropCommand.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/TagProposal.java Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DefaultDropCommand.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DefaultDropWizardModel.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DefaultElementGenerator.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DropCommandFactory.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DropUtils.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DropWizard.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/ExternalDropWizardModel.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/IDropWizardModel.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/ITagProposalLoader.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/NullProposalLoader.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/TagAttributesWizardPage.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/composite/TagAttributesComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/composite/TagProposalsComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/context/DropContext.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Initial moving jsp related dnd to jst.jsp Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2009-09= -18 15:03:45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2009-09= -18 15:06:17 UTC (rev 17665) @@ -375,8 +375,6 @@ class=3D"org.jboss.tools.common.model.ui.dnd.ModelTransfer"/> - = + + + Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DefaultDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultDropCommand.java 2009-09-18 15:03:45 U= TC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultDropCommand.java 2009-09-18 15:06:17 U= TC (rev 17665) @@ -64,7 +64,7 @@ if(getDefaultModel().getDropData()=3D=3Dnull) { throw new IllegalStateException("Wizard model isn't intialized, call se= tDropDataFirst"); //$NON-NLS-1$ } - TagProposal[] proposals = + ITagProposal[] proposals = =3D TagProposalsComposite.getTagProposals( getDefaultModel().getDropData().getMimeType(), getDefaultModel().getDropData().getMimeData(), Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/editors/dnd/DefaultDropCommandRunner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultDropCommandRunner.java 2009-09-18 15:0= 3:45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultDropCommandRunner.java 2009-09-18 15:0= 6:17 UTC (rev 17665) @@ -1,83 +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.model.ui.editors.dnd; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Properties; - -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.ui.texteditor.ITextEditor; - -import org.jboss.tools.common.meta.action.SpecialWizard; - -public class DefaultDropCommandRunner implements SpecialWizard { - String flavor; - String data; - ITextEditor textEditor; - - public boolean runDropCommand(final String flavor, final String data, ITe= xtEditor te) { - final IEditorInput ei =3D te.getEditorInput(); - final ISelectionProvider sp =3D te.getSelectionProvider(); - final ISourceViewer sv =3D getSourceViewer(te); - Display.getDefault().asyncExec(new Runnable() { - public void run() { -// if(parentEditor.getVisualEditor().getController()!=3Dnull ) { - DropCommandFactory.getInstance() - .getDropCommand(flavor, JSPTagProposalFactory.getInstance()) - .execute( - new DropData( - flavor, - data, - ei, - sv, - sp - ) - ); -// } - } - }); - return true; - } - - ISourceViewer getSourceViewer(ITextEditor editor) { - if(!(editor instanceof AbstractTextEditor)) return null; - AbstractTextEditor ae =3D (AbstractTextEditor)editor; - try { - Method m =3D AbstractTextEditor.class.getDeclaredMethod("getSourceViewe= r", new Class[0]); //$NON-NLS-1$ - m.setAccessible(true); - return (ISourceViewer)m.invoke(ae, new Object[0]); - } catch (NoSuchMethodException e1) { - return null; - } catch (InvocationTargetException e2) { - return null; - } catch (IllegalAccessException e2) { - return null; - } - } - - public int execute() { - boolean result =3D runDropCommand(flavor, data, textEditor); - return result ? 0 : 1; - } - - public void setObject(Object object) { - Properties p =3D (Properties)object; - flavor =3D p.getProperty("flavor"); //$NON-NLS-1$ - data =3D p.getProperty("data"); //$NON-NLS-1$ - textEditor =3D (ITextEditor)p.get("textEditor"); //$NON-NLS-1$ - } - -} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DefaultDropWizardModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultDropWizardModel.java 2009-09-18 15:03:= 45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultDropWizardModel.java 2009-09-18 15:06:= 17 UTC (rev 17665) @@ -20,7 +20,7 @@ = public class DefaultDropWizardModel implements IDropWizardModel { = - TagProposal fSelectedTagProp =3D UNDEFINED_TAG_PROPOSAL; + ITagProposal fSelectedTagProp =3D UNDEFINED_TAG_PROPOSAL; DropData fDropData; List fAttributeValues =3D new ArrayList(); boolean promptForTagAttributes =3D true; @@ -31,15 +31,15 @@ this.tagProposalFactory =3D tagProposalFactory; } = - public TagProposal getTagProposal() { + public ITagProposal getTagProposal() { return fSelectedTagProp; } = /** * @see org.jboss.tools.vpe.editor.dnd.IDnDWizardDataModel#setTagProposal= (org.jboss.tools.vpe.editor.dnd.TagProposal) */ - public void setTagProposal(TagProposal selection) { - TagProposal oldValue =3D fSelectedTagProp; + public void setTagProposal(ITagProposal selection) { + ITagProposal oldValue =3D fSelectedTagProp; fSelectedTagProp =3D selection; doLoadTagAttributeDescriptors(); doLoadDefaultAttributeValues(); = @@ -174,9 +174,10 @@ return true; } } + if(values.length > 5) return true; return isPromptForTagAttributesRequired(); } else if(getTagProposal()=3D=3DUNDEFINED_TAG_PROPOSAL){ - TagProposal[] proposals = + ITagProposal[] proposals = =3D TagProposalsComposite.getTagProposals( getDropData().getMimeType(), getDropData().getMimeData(), Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DefaultElementGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultElementGenerator.java 2009-09-18 15:03= :45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DefaultElementGenerator.java 2009-09-18 15:06= :17 UTC (rev 17665) @@ -34,7 +34,7 @@ } = public String generateStartTag() { - TagProposal proposal =3D getWizardDataModel().getTagProposal(); + ITagProposal proposal =3D getWizardDataModel().getTagProposal(); AttributeDescriptorValueProvider valueProvider =3D getWizardDataModel().= getDropData().getValueProvider(); if(valueProvider !=3D null) valueProvider.setProposal(proposal); String tagName =3D valueProvider =3D=3D null ? null : valueProvider.getT= ag(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DropCommandFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropCommandFactory.java 2009-09-18 15:03:45 U= TC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropCommandFactory.java 2009-09-18 15:06:17 U= TC (rev 17665) @@ -13,6 +13,7 @@ import java.util.HashMap; = import org.jboss.tools.common.model.ui.dnd.ModelTransfer; +import org.jboss.tools.common.model.util.ModelFeatureFactory; = /** * The Class DropCommandFactory. @@ -49,30 +50,35 @@ = /** The PACKAGE. */ static String PACKAGE =3D "org.jboss.tools.common.model.ui.editors.dnd.";= //$NON-NLS-1$ + = + static String UNKNOWN_DROP_COMMAND =3D "org.jboss.tools.common.model.ui.e= ditors.dnd.UnknownDropCommand"; //$NON-NLS-1$ + static String TEXT_DROP_COMMAND =3D "org.jboss.tools.common.model.ui.edit= ors.dnd.PlainTextDropCommand"; //$NON-NLS-1$ + static String FILE_DROP_COMMAND =3D "org.jboss.tools.jst.jsp.jspeditor.dn= d.FileDropCommand"; //$NON-NLS-1$ + static String PALETTE_DROP_COMMAND =3D "org.jboss.tools.jst.jsp.jspeditor= .dnd.PaletteDropCommand"; //$NON-NLS-1$ = static { fMimeCommandMap.put( ////nsITransferable.kFileMime - kFileMime, PACKAGE + "FileDropCommand" //$NON-NLS-1$ + kFileMime, FILE_DROP_COMMAND ); fMimeCommandMap.put( ////nsITransferable.kURLMime - kURLMime, PACKAGE + "FileDropCommand" //$NON-NLS-1$ + kURLMime, FILE_DROP_COMMAND ); fMimeCommandMap.put( - ModelTransfer.MODEL, PACKAGE + "PaletteDropCommand" //$NON-NLS-1$ + ModelTransfer.MODEL, PALETTE_DROP_COMMAND ); fMimeCommandMap.put( - "text/plain", PACKAGE + "PlainTextDropCommand" //$NON-NLS-1$ //$NON-NL= S-2$ + "text/plain", TEXT_DROP_COMMAND ); fMimeCommandMap.put( ////nsITransferable.kUnicodeMime - kUnicodeMime, PACKAGE + "PlainTextDropCommand" //$NON-NLS-1$ + kUnicodeMime, TEXT_DROP_COMMAND ); - fMimeCommandMap.put(kHtmlText,PACKAGE + "PlainTextDropCommand"); //$NON-= NLS-1$ + fMimeCommandMap.put(kHtmlText, TEXT_DROP_COMMAND); = fMimeCommandMap.put( - UNKNOWN_MIME_TYPE, PACKAGE + "UnknownDropCommand" //$NON-NLS-1$ + UNKNOWN_MIME_TYPE, UNKNOWN_DROP_COMMAND ); } = @@ -95,17 +101,13 @@ */ public IDropCommand getDropCommand(String mimeType, ITagProposalFactor= y tagProposalFactory) { IDropCommand fInstance =3D UNKNOWN_MIME_COMMAND; - try { - String fClassName =3D (String)fMimeCommandMap.get(mimeType); - Class newClass =3D this.getClass().getClassLoader().loadClass(fClassNam= e); - fInstance =3D (IDropCommand)newClass.newInstance(); + String fClassName =3D (String)fMimeCommandMap.get(mimeType); + fInstance =3D (IDropCommand)ModelFeatureFactory.getInstance().createFeat= ureInstance(fClassName); + if(fInstance =3D=3D null) { + fInstance =3D new UnknownDropCommand(); + } + if(fInstance !=3D null) { fInstance.setTagProposalFactory(tagProposalFactory); - } catch (ClassNotFoundException e) { - //ignore - } catch (InstantiationException e) { - //ignore - } catch (IllegalAccessException e) { - //ignore } return fInstance; } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DropUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropUtils.java 2009-09-18 15:03:45 UTC (rev 1= 7664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropUtils.java 2009-09-18 15:06:17 UTC (rev 1= 7665) @@ -20,17 +20,11 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IFileEditorInput; -import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.ui.ModelUIPlugin; -import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributes= Composite; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.tld.ITaglibMapping; import org.jboss.tools.jst.web.tld.IWebProject; import org.jboss.tools.jst.web.tld.WebProjectFactory; = @@ -43,37 +37,9 @@ = public static final String HTML40_URI =3D ""; //$NON-NLS-1$ = - /** - * Get TLD's content. - * @param input - * @param uri - * @return - */ - public static String getTldContent(IEditorInput input, String uri) { - String tldContent =3D null; - XModel xModel =3D null; - if(input instanceof IModelObjectEditorInput) { - xModel =3D ((IModelObjectEditorInput)input).getXModelObject().getModel(= ); - } else if(input instanceof IFileEditorInput) { - IFile f =3D ((IFileEditorInput)input).getFile(); - XModelObject o =3D EclipseResourceUtil.getObjectByResource(f); - if(o !=3D null) xModel =3D o.getModel(); - } - if(xModel !=3D null) { - ITaglibMapping mapping =3D WebProjectFactory.instance.getWebProject(xMo= del).getTaglibMapping(); - XModelObject xmo =3D mapping.getTaglibObject(uri); - if(xmo !=3D null) { -// tldLocation =3D EclipseResourceUtil.getResource(xmo).getFullPath().t= oString(); - FileAnyImpl fai =3D (FileAnyImpl)xmo; - tldContent =3D fai.getAsText(); - } - } - return tldContent; - } - public static interface AttributeDescriptorValueProvider { public void initContext(Properties context); - public void setProposal(TagProposal proposal); + public void setProposal(ITagProposal proposal); public String getTag(); public boolean canHaveBody(); public TagAttributesComposite.AttributeDescriptorValue[] getValues(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DropWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropWizard.java 2009-09-18 15:03:45 UTC (rev = 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropWizard.java 2009-09-18 15:06:17 UTC (rev = 17665) @@ -46,7 +46,7 @@ super.addPages(); = page1 =3D new TagProposalsWizardPage(); page2 =3D new TagAttributesWizardPage(); - TagProposal[] proposals =3D = + ITagProposal[] proposals =3D = TagProposalsComposite.getTagProposals(getMimeType(),getMimeData(), fDro= pCommand.getTagProposalFactory()); = if(TagProposalsComposite.areThereTagProposals( Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/ExternalDropWizardModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/ExternalDropWizardModel.java 2009-09-18 15:03= :45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/ExternalDropWizardModel.java 2009-09-18 15:06= :17 UTC (rev 17665) @@ -41,7 +41,7 @@ protected void doLoadTagAttributeDescriptors() { if(getTagProposal()!=3DUNDEFINED_TAG_PROPOSAL) { DropData data =3D getDropData(); - TagProposal proposal =3D getTagProposal(); + ITagProposal proposal =3D getTagProposal(); AttributeDescriptorValueProvider valueProvider =3D data.getValueProvide= r(); if(valueProvider !=3D null) valueProvider.setProposal(proposal); AttributeDescriptorValue[] values =3D valueProvider =3D=3D null ? new A= ttributeDescriptorValue[0] Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/editors/dnd/FileDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/FileDropCommand.java 2009-09-18 15:03:45 UTC = (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/FileDropCommand.java 2009-09-18 15:06:17 UTC = (rev 17665) @@ -1,97 +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.model.ui.editors.dnd; - -import java.io.File; -import java.util.Properties; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; - -import org.jboss.tools.common.meta.action.XActionInvoker; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.common.model.ui.dnd.ModelTransfer; -import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; - -/** - * = - * @author eskimo - */ - -// TODO - Eskimo - Think about inserting different type of tags -// - HTML -// - XML(XHTML,JSP) - -public class FileDropCommand extends DefaultDropCommand { - - IElementGenerator generator; - - public void run(IProgressMonitor monitor) throws CoreException { - - generator =3D ElementGeneratorFactory.getInstance().getElementGenerator(= getDefaultModel().getTagProposal().getUri()); - generator.setDataModel(getDefaultModel()); - - Properties properties =3D new Properties(); - properties.put(PaletteInsertHelper.PROPOPERTY_TAG_NAME,getDefaultModel()= .getTagProposal().getName()); - properties.put(PaletteInsertHelper.PROPOPERTY_START_TEXT, generateStartT= ext()); - properties.put(PaletteInsertHelper.PROPOPERTY_END_TEXT, generateEndText(= )); - properties.put(PaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, getReformat= BodyProperty()); - properties.put(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI,getDefaultM= odel().getTagProposal().getUri()); - properties.put(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_VERSION,getDefa= ultModel().getTagProposal().getLibraryVersion()); - properties.put(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX,getDefaultM= odel().getTagProposal().getPrefix()); - properties.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER, getDef= aultModel().getDropData().getSelectionProvider()); - properties.put(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NO= N-NLS-1$ - addCustomProperties(properties); - PaletteInsertHelper.insertIntoEditor( - getDefaultModel().getDropData().getSourceViewer(), - properties - ); - } - - protected void executeUnknownTag() { - DropData data =3D getDefaultModel().getDropData(); - String type =3D data.getMimeType(); - String mime =3D data.getMimeData(); - /*nsITransferable.kFileMime*/ - if("application/x-moz-file".equals(type) && mime !=3D null) { //$NON-NLS= -1$ - if(mime.startsWith("file:")) mime =3D mime.substring(5); //$NON-NLS-1$ - File f =3D new File(mime); - IFile file =3D EclipseResourceUtil.getFile(f.getAbsolutePath()); - if(file =3D=3D null) return; - XModelObject o =3D EclipseResourceUtil.getObjectByResource(file); - if(o =3D=3D null) return; - XActionInvoker.invoke("CopyActions.Copy", o, null); //$NON-NLS-1$ - data.setMimeType(ModelTransfer.MODEL); - data.setMimeData(""); //$NON-NLS-1$ - DropCommandFactory.getInstance().getDropCommand(ModelTransfer.MODEL, ta= gProposalFactory).execute(data); - } - } - - protected void addCustomProperties(Properties properties) {} - - protected String getReformatBodyProperty() { - return "yes"; //$NON-NLS-1$ - } - - protected IDropWizardModel createSpecificModel() { - return new ExternalDropWizardModel(tagProposalFactory); - } - - protected String generateStartText() { - return generator.generateStartTag(); - } - - protected String generateEndText() { - return generator.generateEndTag(); - } -} \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/editors/dnd/FileTagProposalLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/FileTagProposalLoader.java 2009-09-18 15:03:4= 5 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/FileTagProposalLoader.java 2009-09-18 15:06:1= 7 UTC (rev 17665) @@ -1,176 +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.model.ui.editors.dnd; - -import java.util.HashMap; -import java.util.Map; - -import org.jboss.tools.common.model.ui.views.palette.PaletteTaglibInserter; - -public class FileTagProposalLoader implements ITagProposalLoader { - - private static final Map extensionMap =3D new HashM= ap(); - = - static TagProposal[] IMG_TAG_PROPOSALS =3D new TagProposal[]{ - new TagProposal( - DropURI.JSF_HTML_URI, - "h", //$NON-NLS-1$ - "graphicImage", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("value","","") //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ - ), - new TagProposal( - DropURI.HTML_4_0_URI, - TagProposal.EMPTY_PREFIX, - "img", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("src","","") //$NON-NLS-1$ //$= NON-NLS-2$ //$NON-NLS-3$ - ), - new TagProposal( - DropURI.STRUTS_HTML_URI, - "html", //$NON-NLS-1$ - "img", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-NLS-1$ //= $NON-NLS-2$ //$NON-NLS-3$ - ), - new TagProposal( - DropURI.SEAM_URI, - "s", //$NON-NLS-1$ - "graphicImage", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("url","","") //$NON-NLS-1$ //= $NON-NLS-2$ //$NON-NLS-3$ - ) -// yradtsevich: fix of JBIDE-3984: Exclude t:graphicImage option from Inse= rt tag dialog = -// , -// new TagProposal( -// DropURI.TOMOHAWK_URI, -// "t", -// "graphicImage", -// new AbsoluteFilePathAttributeValueLoader("url","","") -// ) - }; - = - static TagProposal[] CSS_TAG_PROPOSALS =3D new TagProposal[]{ - new TagProposal( - DropURI.HTML_4_0_URI, - TagProposal.EMPTY_PREFIX, - "link", //$NON-NLS-1$ - new CssLinkAttributeValueLoader("href") //$NON-NLS-1$ - ), - }; - = - static TagProposal JSP_INCLUDE =3D new TagProposal( - DropURI.JSP_URI, - "jsp", //$NON-NLS-1$ - "include", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-NLS-= 1$ //$NON-NLS-2$ //$NON-NLS-3$ - ); - = - static TagProposal JSP_FORWARD =3D new TagProposal( - DropURI.JSP_URI, - "jsp", //$NON-NLS-1$ - "forward", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-NLS-1$ //$= NON-NLS-2$ //$NON-NLS-3$ - ); - = - static TagProposal UI_INCLUDE =3D new TagProposal( - PaletteTaglibInserter.faceletUri, - "ui", //$NON-NLS-1$ - "include", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("src","","") //$NON-NLS-1= $ //$NON-NLS-2$ //$NON-NLS-3$ - ); - = - static TagProposal S_DECORATE =3D new TagProposal( - DropURI.SEAM_URI, - "s", //$NON-NLS-1$ - "decorate", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("template","","") //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ); - = - static TagProposal[] PAGE_TAG_PROPOSALS =3D new TagProposal[]{ - JSP_INCLUDE, - JSP_FORWARD - }; - = - static TagProposal[] XHTML_PAGE_TAG_PROPOSALS =3D new TagProposal[]{ - JSP_INCLUDE, - JSP_FORWARD, - UI_INCLUDE, - S_DECORATE - }; - = - static { - // There is the question here what store HTML or TLD will been asked abo= ut TagDescription = - extensionMap.put("jpg", IMG_TAG_PROPOSALS); //$NON-NLS-1$ - - extensionMap.put("jpeg", IMG_TAG_PROPOSALS); //$NON-NLS-1$ - - extensionMap.put("gif",IMG_TAG_PROPOSALS); //$NON-NLS-1$ - = - extensionMap.put("bmp",IMG_TAG_PROPOSALS); //$NON-NLS-1$ - = - extensionMap.put("png",IMG_TAG_PROPOSALS); //$NON-NLS-1$ - = - extensionMap.put("jsp",PAGE_TAG_PROPOSALS); //$NON-NLS-1$ - extensionMap.put("html",PAGE_TAG_PROPOSALS); //$NON-NLS-1$ - extensionMap.put("xhtml",XHTML_PAGE_TAG_PROPOSALS); //$NON-NLS-1$ - - extensionMap.put( - "properties",new TagProposal[]{ //$NON-NLS-1$ - new TagProposal( - DropURI.JSF_CORE_URI, - "f", //$NON-NLS-1$ - "loadBundle", //$NON-NLS-1$ - new LoadBundleBaseNameAttributeValueLoader() - ) - } - ); - extensionMap.put("css",CSS_TAG_PROPOSALS); //$NON-NLS-1$ - extensionMap.put( - "inc", new TagProposal[]{ //$NON-NLS-1$ - new TagProposal( - DropURI.JSP_URI, - "jsp", //$NON-NLS-1$ - "include", //$NON-NLS-1$ - new AbsoluteFilePathAttributeValueLoader("page","","") //$NON-N= LS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - ) - } - ); - = - } - = - public static boolean isExtensionMapped(String extension) { - return extension !=3D null && extensionMap.containsKey(extension.toLower= Case()); - } - = - public TagProposal[] getTagProposals(Object data) { - String fileName =3D data.toString(); - String extension =3D fileName.substring(fileName.lastIndexOf(".")+1); //= $NON-NLS-1$ - TagProposal[] tagProposals =3D (TagProposal[])extensionMap.get(extension= .toLowerCase()); - if(tagProposals=3D=3Dnull) { - tagProposals =3D new TagProposal[0]; - } - return tagProposals; - } - = - public boolean isTagProposalExists(Object data) { - return true; - } - - public static class ImageFileAttributesValuesLoader implements IAttribute= ValueLoader { - - public void fillTagAttributes(IDropWizardModel model) { - } - = - } - = - public static class JspFileAttributesValuesLoader implements IAttributeVa= lueLoader { - - public void fillTagAttributes(IDropWizardModel model) { - } - } -} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/IDropWizardModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/IDropWizardModel.java 2009-09-18 15:03:45 UTC= (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/IDropWizardModel.java 2009-09-18 15:06:17 UTC= (rev 17665) @@ -25,16 +25,35 @@ public static final String TAG_PROPOSAL =3D "tagProposal"; //$NON-NLS-1$ = public static final String ATTRIBUTE_VALUE =3D "attributeValue"; //$NON-= NLS-1$ - = - public static final TagProposal UNDEFINED_TAG_PROPOSAL =3D new TagProposa= l("http://www.redhat.com/undefined","",""); //$NON-NLS-1$ //$NON-NLS-2$ //= $NON-NLS-3$ = + public static final ITagProposal UNDEFINED_TAG_PROPOSAL =3D new ITagPropo= sal() { + public IAttributeValueLoader getAttributesValueLoader() { + return EMPTY_ATTRIBUTE_VALUE_LOADER; + } + public String getDetails() { + return "http://www.redhat.com/undefined"; + } + public String getDisplayString() { + return EMPTY_PREFIX; + } + + public String getName() { + return EMPTY_PREFIX; + } + + public String getPrefix() { + return EMPTY_PREFIX; + } + = + }; + /* * Methods = */ = - public TagProposal getTagProposal(); + public ITagProposal getTagProposal(); = - public void setTagProposal(TagProposal selection); + public void setTagProposal(ITagProposal selection); = public void setAttributeValue(AttributeDescriptorValue name, Object value= ); = Added: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/t= ools/common/model/ui/editors/dnd/ITagProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/ITagProposal.java (re= v 0) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/ITagProposal.java 2009-09-18 15:06:17 UTC (re= v 17665) @@ -0,0 +1,21 @@ +package org.jboss.tools.common.model.ui.editors.dnd; + +public interface ITagProposal { + public static final IAttributeValueLoader EMPTY_ATTRIBUTE_VALUE_LOADER = =3D new IAttributeValueLoader() { + public void fillTagAttributes(IDropWizardModel model) { + // do nothing + } + }; + public static String EMPTY_PREFIX =3D ""; + + public String getName(); + + public String getPrefix(); + + public IAttributeValueLoader getAttributesValueLoader(); + + public String getDisplayString(); + + public String getDetails(); + +} Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui/s= rc/org/jboss/tools/common/model/ui/editors/dnd/ITagProposal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/ITagProposalLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/ITagProposalLoader.java 2009-09-18 15:03:45 U= TC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/ITagProposalLoader.java 2009-09-18 15:06:17 U= TC (rev 17665) @@ -11,6 +11,6 @@ package org.jboss.tools.common.model.ui.editors.dnd; = public interface ITagProposalLoader { - public TagProposal[] getTagProposals(Object data); + public ITagProposal[] getTagProposals(Object data); public boolean isTagProposalExists(Object data); = } Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/editors/dnd/JSPTagProposalFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/JSPTagProposalFactory.java 2009-09-18 15:03:4= 5 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/JSPTagProposalFactory.java 2009-09-18 15:06:1= 7 UTC (rev 17665) @@ -1,54 +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.model.ui.editors.dnd; - -import java.util.HashMap; -import java.util.Map; - -import org.jboss.tools.common.model.ui.ModelUIPlugin; - -public class JSPTagProposalFactory implements ITagProposalFactory { - private static final JSPTagProposalFactory INSTANCE =3D new JSPTagProposa= lFactory(); = - public static Map loaderMap =3D new HashMap= (); = - - static { - loaderMap.put(DropCommandFactory.kFileMime, DropCommandFactory.PACKAGE += "FileTagProposalLoader"); //$NON-NLS-1$ - loaderMap.put(DropCommandFactory.kURLMime, DropCommandFactory.PACKAGE + = "FileTagProposalLoader"); //$NON-NLS-1$ - } - = - public static JSPTagProposalFactory getInstance() { - return INSTANCE; - } - = - private JSPTagProposalFactory() { - } - = - public ITagProposalLoader getProposalLoader(String mimeType) { - ITagProposalLoader fInstance =3D DEFAULT_PROPOSAL_LOADER; - try { - String fClassName =3D (String)loaderMap.get(mimeType); - if(fClassName =3D=3D null) { - //No need to report, just there is no specific proposal loader for thi= s myme type. - return fInstance; - } - Class newClass =3D this.getClass().getClassLoader().loadClass(fClassNam= e); - fInstance =3D (ITagProposalLoader)newClass.newInstance(); - } catch (InstantiationException e) { - ModelUIPlugin.getPluginLog().logError(e); - } catch (IllegalAccessException e) { - ModelUIPlugin.getPluginLog().logError(e); - } catch (ClassNotFoundException e) { - ModelUIPlugin.getPluginLog().logError(e); - } - return fInstance; - } -} - Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/NullProposalLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/NullProposalLoader.java 2009-09-18 15:03:45 U= TC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/NullProposalLoader.java 2009-09-18 15:06:17 U= TC (rev 17665) @@ -12,8 +12,8 @@ = public class NullProposalLoader implements ITagProposalLoader { = - public TagProposal[] getTagProposals(Object data) { - return new TagProposal[0]; + public ITagProposal[] getTagProposals(Object data) { + return new ITagProposal[0]; } = public boolean isTagProposalExists(Object data) { Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/editors/dnd/PaletteDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/PaletteDropCommand.java 2009-09-18 15:03:45 U= TC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/PaletteDropCommand.java 2009-09-18 15:06:17 U= TC (rev 17665) @@ -1,330 +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.model.ui.editors.dnd; - -import java.util.Properties; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IFileEditorInput; -import org.eclipse.wst.xml.core.internal.document.ElementImpl; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.model.ui.ModelUIPlugin; -import org.jboss.tools.common.model.ui.dnd.DnDUtil; -import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; -import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributes= Composite.AttributeDescriptorValue; -import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; -import org.jboss.tools.common.model.ui.views.palette.PaletteInsertManager; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.tld.IWebProject; -import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; -import org.jboss.tools.jst.web.tld.URIConstants; -import org.jboss.tools.jst.web.tld.WebProjectFactory; - -/** - * = - * @author eskimo - */ -public class PaletteDropCommand extends FileDropCommand { - Properties initialValues =3D new Properties(); - String startText; - String endText; = - String newLine; - String reformat =3D "no"; //$NON-NLS-1$ - - Properties properties =3D new Properties(); - boolean callPaletteWizard =3D false; - - /** - * = - */ - protected IDropWizardModel createSpecificModel() { - return new PaletteDropWizardModel(tagProposalFactory); - } - - protected void addCustomProperties(Properties runningProperties) { = - newLine =3D properties.getProperty(PaletteInsertHelper.PROPOPERTY_NEW_LI= NE); - if (newLine =3D=3D null) newLine=3D"true"; //$NON-NLS-1$ - runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_NEW_LINE, n= ewLine); - String addTaglib =3D properties.getProperty(PaletteInsertHelper.PROPOPER= TY_ADD_TAGLIB); - if(addTaglib =3D=3D null) addTaglib =3D "true"; //$NON-NLS-1$ - runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB,= addTaglib); - } - = - public void execute() { - if(getDefaultModel().getTagProposal() =3D=3D IDropWizardModel.UNDEFINED_= TAG_PROPOSAL) { - if(startText =3D=3D null && endText =3D=3D null) return; - int pos =3D ((ITextSelection)getDefaultModel().getDropData().getSelecti= onProvider().getSelection()).getOffset(); - getDefaultModel().getDropData().getSourceViewer().setSelectedRange(pos,= 0); - if(startText !=3D null) properties.setProperty(PaletteInsertHelper.PROP= OPERTY_START_TEXT, startText); - if(endText !=3D null) properties.setProperty(PaletteInsertHelper.PROPOP= ERTY_END_TEXT, endText); - if(reformat !=3D null) properties.setProperty(PaletteInsertHelper.PROPO= PERTY_REFORMAT_BODY, reformat); - if(newLine !=3D null) properties.setProperty(PaletteInsertHelper.PROPOP= ERTY_NEW_LINE, newLine); - PaletteInsertHelper.insertIntoEditor( - getDefaultModel().getDropData().getSourceViewer(), - properties - ); - } else { - DropData data =3D getDefaultModel().getDropData(); - ISourceViewer viewer =3D data.getSourceViewer(); - if(data.getContainer() !=3D null){ - if (data.getContainer() instanceof ElementImpl) { - ElementImpl container =3D (ElementImpl)data.getContainer(); - if(!container.hasEndTag()){ - try{ - IDocument document =3D viewer.getDocument(); - int containerOffset =3D container.getStartOffset(); - int containerLenght =3D container.getStartEndOffset()-containerOffs= et; - String containerString =3D document.get(containerOffset, containerL= enght); - int slashPosition =3D containerString.lastIndexOf("/"); //$NON-NLS-= 1$ - if(slashPosition >=3D 0){ - int deltaOffset =3D (containerString.length()-1)-slashPosition; - String text =3D ""; //$NON-NLS-1$ - for(int i=3D0; i < deltaOffset;i++) text +=3D " "; //$NON-NLS-1$ - text +=3D ">"; //$NON-NLS-1$ //$NON-= NLS-2$ - document.replace(containerOffset+slashPosition, containerString.le= ngth()-slashPosition, text); - } - }catch(BadLocationException ex){ - ModelUIPlugin.getPluginLog().logError(ex); - } - } - } - } = - super.execute(); - } - } - - public void initialize() { - DropData data =3D getDefaultModel().getDropData(); = - = - IEditorInput input =3D data.getEditorInput(); - XModelObject target =3D null; - IFile f =3D null; - if(input instanceof IFileEditorInput) { - f =3D ((IFileEditorInput)input).getFile(); - target =3D EclipseResourceUtil.getObjectByResource(f); - if(target =3D=3D null && f.exists()) { - target =3D EclipseResourceUtil.createObjectForResource(f); - } - } else if(input instanceof IModelObjectEditorInput) { - target =3D ((IModelObjectEditorInput)input).getXModelObject(); - } - if(target =3D=3D null) { - initialize2(); - } else { - ISourceViewer viewer =3D data.getSourceViewer(); - = - properties =3D new Properties(); - properties.put("viewer", viewer); //$NON-NLS-1$ - properties.setProperty("text", viewer.getDocument().get()); //$NON-NLS-= 1$ - properties.setProperty("isDrop", "true"); //$NON-NLS-1$ //$NON-NLS-2$ - properties.setProperty("actionSourceGUIComponentID", "editor"); //$NON-= NLS-1$ //$NON-NLS-2$ - properties.setProperty("accepsAsString", "true"); //$NON-NLS-1$ //$NON-= NLS-2$ - = - if(f !=3D null) { - properties.put("file", f); //$NON-NLS-1$ - } - ISelection selection =3D data.getSelectionProvider().getSelection(); - = - int offset =3D 0; - //int length =3D 0; - if(selection instanceof ITextSelection) { - offset =3D ((ITextSelection)selection).getOffset(); - //length =3D ((ITextSelection)selection).getLength(); - } else { - offset =3D viewer.getTextWidget().getCaretOffset(); - } - properties.setProperty("pos", "" + offset); //$NON-NLS-1$ //$NON-NLS-2$ - if(selection instanceof IStructuredSelection && !selection.isEmpty()) { - Object so =3D ((IStructuredSelection)selection).getFirstElement(); - if(so instanceof IDOMElement) { - String en =3D ((IDOMElement)so).getNodeName(); - properties.setProperty("context:tagName", en); //$NON-NLS-1$ - String attrName =3D data.getAttributeName(); - if(attrName !=3D null) { - properties.setProperty("context:attrName", attrName); //$NON-NLS-1$ - } - } - } - try { - if(DnDUtil.isPasteEnabled(target)) { - DnDUtil.paste(target, properties); - } else { - XModelObject s =3D PreferenceModelUtilities.getPreferenceModel().getM= odelBuffer().source(); - if(s !=3D null) { - properties.setProperty("start text", "" + getDefaultText(s)); //$NON= -NLS-1$ //$NON-NLS-2$ - properties.setProperty("end text", ""); //$NON-NLS-1$ //$NON-NLS-2$ - properties.setProperty("new line", "newLine"); //$NON-NLS-1$ //$NON-= NLS-2$ - } - } - } catch (CoreException e) { - ModelUIPlugin.getPluginLog().logError(e); - } - startText =3D properties.getProperty(TLDToPaletteHelper.START_TEXT); - endText =3D properties.getProperty(TLDToPaletteHelper.END_TEXT); - reformat =3D properties.getProperty(TLDToPaletteHelper.REFORMAT); - String uri =3D properties.getProperty(URIConstants.LIBRARY_URI); - String libraryVersion =3D properties.getProperty(URIConstants.LIBRARY_V= ERSION); - String defaultPrefix =3D properties.getProperty(URIConstants.DEFAULT_PR= EFIX); - String tagname =3D properties.getProperty("tag name"); //$NON-NLS-1$ - = - callPaletteWizard =3D PaletteInsertManager.getInstance().getWizardName(= properties) !=3D null; - = - boolean isWizardEnabled =3D (!"FileJAVA".equals(target.getModelEntity()= .getName())); //$NON-NLS-1$ - if(getDefaultModel() instanceof PaletteDropWizardModel) { - ((PaletteDropWizardModel)getDefaultModel()).setWizardEnabled(isWizardE= nabled); - } - = - if(uri =3D=3D null || tagname =3D=3D null) { - getDefaultModel().setTagProposal(IDropWizardModel.UNDEFINED_TAG_PROPOS= AL); - } else { - getDefaultModel().setTagProposal(new TagProposal(uri, libraryVersion, = defaultPrefix, tagname)); - insertInitialValues(); - } - } = - } - - private void initialize2() { - XModelObject object =3D PreferenceModelUtilities.getPreferenceModel().ge= tModelBuffer().source(); - String tagname =3D object.getAttributeValue("name"); //$NON-NLS-1$ - XModelObject parent =3D object.getParent(); - String uri =3D (parent =3D=3D null) ? "" : parent.getAttributeValue(URIC= onstants.LIBRARY_URI); //$NON-NLS-1$ - String libraryVersion =3D (parent =3D=3D null) ? "" : parent.getAttribut= eValue(URIConstants.LIBRARY_VERSION); //$NON-NLS-1$ - String defaultPrefix =3D (parent =3D=3D null) ? "" : parent.getAttribute= Value(URIConstants.DEFAULT_PREFIX); //$NON-NLS-1$ - this.getDefaultModel().setTagProposal(new TagProposal(uri, libraryVersio= n,defaultPrefix,tagname)); - startText =3D object.getAttributeValue("start text"); //$NON-NLS-1$ - endText =3D object.getAttributeValue("end text"); //$NON-NLS-1$ - } - = - private void insertInitialValues() { - parseInitialValues(startText); - AttributeDescriptorValue[] vs =3D getDefaultModel().getAttributeValueDes= criptors(); - for (int i =3D 0; i < vs.length; i++) { - String v =3D initialValues.getProperty(vs[i].getName()); - if(v !=3D null) vs[i].setValue(v); - } - } - = - private void parseInitialValues(String startText) { - if(startText =3D=3D null || startText.length() =3D=3D 0) return; - int bi =3D startText.indexOf('<'); - if(bi < 0) return; - int ei =3D startText.indexOf('>', bi); - if(ei < 0) return; - String header =3D startText.substring(bi + 1, ei); - int NOTHING =3D 0; - int ATT_NAME =3D 1; - int ATT_VALUE =3D 2; - char quote =3D '\0'; - int state =3D NOTHING; - String name =3D null; - String value =3D null; - for (int i =3D 0; i < header.length(); i++) { - char c =3D header.charAt(i); - if(state =3D=3D NOTHING) { - if(Character.isJavaIdentifierStart(c)) { - name =3D "" + c; //$NON-NLS-1$ - state =3D ATT_NAME; - } - } else if(state =3D=3D ATT_NAME) { - if(Character.isJavaIdentifierPart(c) || c =3D=3D ':') { - name +=3D c; - } else if(c =3D=3D '=3D') { - state =3D ATT_VALUE; - quote =3D '\0'; - } - } else if(state =3D=3D ATT_VALUE) { - if(c =3D=3D quote) { - initialValues.setProperty(name, value); - name =3D null; - value =3D null; - state =3D NOTHING; - quote =3D '\0'; - } else if(c =3D=3D '"' || c =3D=3D '\'') { - quote =3D c; - value =3D ""; //$NON-NLS-1$ - } else if(quote !=3D '\0') { - value +=3D c; - } - } - } - } = - - protected String generateStartText() { - startText =3D properties.getProperty("start text"); //$NON-NLS-1$ - if(getDefaultModel().getTagProposal()=3D=3DIDropWizardModel.UNDEFINED_TA= G_PROPOSAL - || getDefaultModel().getTagProposal().getUri().length() =3D=3D 0) { - return startText; - } - String s1 =3D super.generateStartText(); - String s2 =3D startText; - if(s2 =3D=3D null) return s1; - if(s1.indexOf('=3D') < 0) return s2; // no input - int bi1 =3D s1.indexOf('<'); - int bi2 =3D s2.indexOf('<'); - if(bi2 < 0 || bi1 < 0) return s2; - int ei1 =3D s1.indexOf('>', bi1); - int ei2 =3D s2.indexOf('>', bi2); - if(ei1 < 0 || ei2 < 0) return s1; - boolean slash1 =3D s1.charAt(ei1 - 1) =3D=3D '/'; - boolean slash2 =3D s2.charAt(ei2 - 1) =3D=3D '/'; - if(slash1 && !slash2) { - s2 =3D s2.substring(0, bi2) + s1.substring(bi1, ei1 - 1) + s2.substring= (ei2); - } else if(!slash1 && slash2) { - s2 =3D s2.substring(0, bi2) + s1.substring(bi1, ei1) + s2.substring(ei2= - 1); - } else { - s2 =3D s2.substring(0, bi2) + s1.substring(bi1, ei1) + s2.substring(ei2= ); - } - return s2; - } - - protected String generateEndText() { - endText =3D properties.getProperty("end text"); //$NON-NLS-1$ - return (endText !=3D null) ? endText : ""; //$NON-NLS-1$ - } - - protected String getReformatBodyProperty() { - return reformat; - } - - protected IDropWizard createDropWizard() { - String wizardName =3D PaletteInsertManager.getInstance().getWizardName(p= roperties); - = - IDropWizard wizard =3D null; - if(wizardName !=3D null) { - wizard =3D (IDropWizard)PaletteInsertManager.getInstance().createWizard= Instance(properties); - } - if(wizard =3D=3D null) wizard =3D new DropWizard(); - wizard.setCommand(this); - return wizard; - } - = - public Properties getProperties() { - return properties; - } - = - private String getDefaultText(XModelObject o) { - if(o =3D=3D null) return ""; //$NON-NLS-1$ - if(o.getFileType() !=3D XModelObject.FILE) return o.getPresentationStrin= g(); - IWebProject p =3D WebProjectFactory.instance.getWebProject(o.getModel()); - String path =3D p.getPathInWebRoot(o); - return path =3D=3D null ? o.getPresentationString() : path; - } -} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/TagAttributesWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/TagAttributesWizardPage.java 2009-09-18 15:03= :45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/TagAttributesWizardPage.java 2009-09-18 15:06= :17 UTC (rev 17665) @@ -119,10 +119,10 @@ * */ protected void updateTitle() { - TagProposal tagProposal =3D (TagProposal)getDropWizardModel().getTagProp= osal(); + ITagProposal tagProposal =3D getDropWizardModel().getTagProposal(); StringBuffer titleText =3D new StringBuffer(); titleText.append("<"); //$NON-NLS-1$ - if(!TagProposal.EMPTY_PREFIX.equals(tagProposal.getPrefix())) { + if(!ITagProposal.EMPTY_PREFIX.equals(tagProposal.getPrefix())) { titleText .append(tagProposal.getPrefix()) .append(":"); //$NON-NLS-1$ Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/editors/dnd/TagProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/TagProposal.java 2009-09-18 15:03:45 UTC (rev= 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/TagProposal.java 2009-09-18 15:06:17 UTC (rev= 17665) @@ -1,101 +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.model.ui.editors.dnd; - -public class TagProposal { - = - public static final String EMPTY_PREFIX =3D ""; //$NON-NLS-1$ - public static final String EMPTY_URI =3D ""; //$NON-NLS-1$ - = - public static final IAttributeValueLoader EMPTY_ATTRIBUTE_VALUE_LOADER = =3D new IAttributeValueLoader() { - public void fillTagAttributes(IDropWizardModel model) { - // do nothing - } - }; - = - String uri; - String libraryVersion =3D ""; //$NON-NLS-1$ - String prefix; - String name; - IAttributeValueLoader attributeValueLoader =3D EMPTY_ATTRIBUTE_VALUE_LOA= DER; - = - /** - * TagProposal with empty attribute value loader = - * - */ - public TagProposal( - String uri, = - String prefix, = - String name - ) { - this(uri, "", prefix, name); //$NON-NLS-1$ - } - - public TagProposal( - String uri, - String libraryVersion, - String prefix, = - String name - ) { - this.uri =3D uri; - this.libraryVersion =3D (libraryVersion =3D=3D null) ? "" : libraryVers= ion; //$NON-NLS-1$ - this.prefix =3D prefix; - this.name =3D name; - } - - /** - * = - * - */ - public TagProposal( - String uri, = - String prefix, = - String name, - IAttributeValueLoader loader - ) { - this.uri =3D uri; - this.prefix =3D prefix; - this.name =3D name; - this.attributeValueLoader =3D loader; - } - = - /** - * = - * @return - */ - public String getName() { - return name; - } - = - /** - * = - * @return - */ - public String getPrefix() { - return prefix; - } - - /** - * = - * @return - */ - public String getUri() { - return uri; - } - = - public String getLibraryVersion() { - return libraryVersion; - } - = - public IAttributeValueLoader getAttributesValueLoader() { - return attributeValueLoader; - } -} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-09= -18 15:03:45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-09= -18 15:06:17 UTC (rev 17665) @@ -225,7 +225,7 @@ context.setProperty("attributeName", attrDescr.getName()); //$NON-NLS= -1$ String tagName =3D "" + fWizardModel.getTagProposal().getName(); //$N= ON-NLS-1$ String prefix =3D fWizardModel.getTagProposal().getPrefix(); - if(prefix !=3D null && prefix.length() > 0 && !tagName.startsWith("pr= efix" + ":")) { //$NON-NLS-1$ //$NON-NLS-2$ + if(prefix !=3D null && prefix.length() > 0 && !tagName.startsWith(pre= fix + ":")) { //$NON-NLS-1$ //$NON-NLS-2$ tagName =3D prefix + ":" + tagName; //$NON-NLS-1$ } context.setProperty("nodeName", tagName); //$NON-NLS-1$ Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/composite/TagProposalsComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/composite/TagProposalsComposite.java 2009-09-= 18 15:03:45 UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/composite/TagProposalsComposite.java 2009-09-= 18 15:06:17 UTC (rev 17665) @@ -27,23 +27,16 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.jboss.tools.common.model.ui.editors.dnd.IDropWizardModel; +import org.jboss.tools.common.model.ui.editors.dnd.ITagProposal; import org.jboss.tools.common.model.ui.editors.dnd.ITagProposalFactory; -import org.jboss.tools.common.model.ui.editors.dnd.TagProposal; = public class TagProposalsComposite extends Composite { = - private TagProposal selection =3D IDropWizardModel.UNDEFINED_TAG_PROPOSAL; + private ITagProposal selection =3D IDropWizardModel.UNDEFINED_TAG_PROPOSA= L; CheckboxTableViewer tableTreeViewer; - TagProposal[] fTagProposals; + ITagProposal[] fTagProposals; IDropWizardModel fModel; = = -// public interface ITagProposalSelectionListener { -// public void tagProposalSelected(TagProposal pproposal); -// } - = -// private ITagProposalSelectionListener listener =3D null; -// private String fMimeType; = - = public TagProposalsComposite(Composite parent, int styles,IDropWizardMode= l model) { super(parent,styles); fModel =3D model; @@ -90,7 +83,7 @@ tableTreeViewer.addCheckStateListener( new ICheckStateListener() { public void checkStateChanged(CheckStateChangedEvent event) { - TagProposal proposal =3D (TagProposal) event.getElement(); + ITagProposal proposal =3D (ITagProposal)event.getElement(); if (event.getChecked()) { if(selection!=3DIDropWizardModel.UNDEFINED_TAG_PROPOSAL) { tableTreeViewer.setChecked(selection, false); = @@ -130,13 +123,13 @@ } = public String getColumnText(Object element, int columnIndex) { - TagProposal prop =3D (TagProposal)element; + ITagProposal prop =3D (ITagProposal)element; switch (columnIndex) { case TAG_NAME_INDEX: - return prop.getPrefix()=3D=3DTagProposal.EMPTY_PREFIX?prop.getName(= ):prop.getPrefix()+":"+prop.getName(); //$NON-NLS-1$ + return prop.getDisplayString(); = case TAG_URI_INDEX: - return prop.getUri(); + return prop.getDetails(); } throw new IllegalArgumentException("Wrong column index for LabelProvi= der"); //$NON-NLS-1$ } @@ -162,7 +155,7 @@ /// listener =3D l; /// } = - public TagProposal[] getTagProposals() { + public ITagProposal[] getTagProposals() { return fTagProposals; } = @@ -174,7 +167,7 @@ return tagProposalFactory.getProposalLoader(mimeType).getTagProposals(dr= opData).length>0; = } = - public static TagProposal[] getTagProposals(String mimeType,String dropDa= ta, ITagProposalFactory tagProposalFactory) { + public static ITagProposal[] getTagProposals(String mimeType,String dropD= ata, ITagProposalFactory tagProposalFactory) { return tagProposalFactory.getProposalLoader(mimeType).getTagProposals(dr= opData); = } = Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/context/DropContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/context/DropContext.java 2009-09-18 15:03:45 = UTC (rev 17664) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/context/DropContext.java 2009-09-18 15:06:17 = UTC (rev 17665) @@ -12,6 +12,8 @@ = import java.io.File; import java.net.MalformedURLException; +import java.util.HashSet; +import java.util.Set; = import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -35,7 +37,6 @@ import org.jboss.tools.common.model.ui.dnd.VpeDnDEvent; import org.jboss.tools.common.model.ui.dnd.VpeTextDropAction; import org.jboss.tools.common.model.ui.editors.dnd.DropUtils; -import org.jboss.tools.common.model.ui.editors.dnd.FileTagProposalLoader; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.web.tld.TLDUtil; = @@ -160,13 +161,19 @@ } event =3D null; } + + //see FileTagProposalLoader + public static Set mappedExtensions =3D new HashSet(); + public static boolean isExtensionMapped(String extension) { + return extension !=3D null && mappedExtensions.contains(extension.toLowe= rCase()); + } = private boolean dropAsFileObject(XModelObject o) { if(o =3D=3D null) return false; if(o.getFileType() !=3D XModelObject.FILE || isOverAttributeValue) retur= n false; if(TLDUtil.isTaglib(o)) return false; String extension =3D o.getAttributeValue("extension"); //$NON-NLS-1$ - return extension !=3D null && FileTagProposalLoader.isExtensionMapped= (extension); + return extension !=3D null && isExtensionMapped(extension); } = class TransferHolder { --===============6174360321477397825==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 11:08:13 2009 Content-Type: multipart/mixed; boundary="===============6969072184466312142==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17666 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette. Date: Fri, 18 Sep 2009 11:08:13 -0400 Message-ID: <200909181508.n8IF8D7W029743@svn01.web.mwc.hst.phx2.redhat.com> --===============6969072184466312142== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 11:08:12 -0400 (Fri, 18 Sep 2009) New Revision: 17666 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/DataTableWizard.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/DataTableWizardPage.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/OutputLinkWizard.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/OutputLinkWizardPage.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/PanelGridWizard.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/PanelGridWizardPage.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/SelectItemsWizard.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiza= rd/palette/SelectItemsWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Initial moving jsp related dnd to jst.jsp Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/DataTableWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/DataTableWizard.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/DataTableWizard.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -19,6 +19,7 @@ = import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagProposalsC= omposite; +import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand; = public class DataTableWizard extends Wizard implements PropertyChangeListe= ner, IDropWizard { @@ -38,7 +39,7 @@ page2 =3D new DataTableWizardPage(); page2.setProperties(fDropCommand.getProperties()); = - TagProposal[] proposals =3D = + ITagProposal[] proposals =3D = TagProposalsComposite.getTagProposals(getMimeType(),getMimeData(), fDro= pCommand.getTagProposalFactory()); = if(TagProposalsComposite.areThereTagProposals( Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/DataTableWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/DataTableWizardPage.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/DataTableWizardPage.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -41,6 +41,7 @@ import org.jboss.tools.jsf.model.pv.JSFPromptingProvider; import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.ui.Messages; +import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributes= Composite.AttributeDescriptorValue; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/OutputLinkWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/OutputLinkWizard.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/OutputLinkWizard.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -18,6 +18,7 @@ = import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.*; +import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand; = /** * @author erick = @@ -78,7 +79,7 @@ = page2 =3D new OutputLinkWizardPage(); = - TagProposal[] proposals =3D = + ITagProposal[] proposals =3D = TagProposalsComposite.getTagProposals(getMimeType(),getMimeData(), fDro= pCommand.getTagProposalFactory()); = this.addPage(page2); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/OutputLinkWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/OutputLinkWizardPage.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/OutputLinkWizardPage.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -24,6 +24,7 @@ import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributes= Composite.AttributeDescriptorValue; +import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; = /** * @author erick = Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/PanelGridWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/PanelGridWizard.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/PanelGridWizard.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -17,6 +17,7 @@ = import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.*; +import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand; = /** * @author erick = @@ -46,7 +47,7 @@ super.addPages(); page2 =3D new PanelGridWizardPage(); = - TagProposal[] proposals =3D TagProposalsComposite.getTagProposals( + ITagProposal[] proposals =3D TagProposalsComposite.getTagProposals( getMimeType(), getMimeData(), fDropCommand .getTagProposalFactory()); = Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/PanelGridWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/PanelGridWizardPage.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/PanelGridWizardPage.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -19,6 +19,7 @@ = import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributes= Composite.AttributeDescriptorValue; +import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; = /** * @author erick Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/SelectItemsWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/SelectItemsWizard.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/SelectItemsWizard.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -18,6 +18,7 @@ = import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.*; +import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand; = /** * @author erick = @@ -79,7 +80,7 @@ = page2 =3D new SelectItemsWizardPage(); = - TagProposal[] proposals =3D TagProposalsComposite.getTagProposals( + ITagProposal[] proposals =3D TagProposalsComposite.getTagProposals( getMimeType(), getMimeData(), fDropCommand .getTagProposalFactory()); = Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/= ui/wizard/palette/SelectItemsWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/SelectItemsWizardPage.java 2009-09-18 15:06:17 UTC (rev 17665) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wiz= ard/palette/SelectItemsWizardPage.java 2009-09-18 15:08:12 UTC (rev 17666) @@ -22,6 +22,7 @@ import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.editors.dnd.*; +import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; = /** * @author erick = --===============6969072184466312142==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 11:09:26 2009 Content-Type: multipart/mixed; boundary="===============8542087680709210040==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17667 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor. Date: Fri, 18 Sep 2009 11:09:26 -0400 Message-ID: <200909181509.n8IF9QQF029943@svn01.web.mwc.hst.phx2.redhat.com> --===============8542087680709210040== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 11:09:26 -0400 (Fri, 18 Sep 2009) New Revision: 17667 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= Controller.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Initial moving jsp related dnd to jst.jsp Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2009-09-18 15:08:12 UTC (rev 17666) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2009-09-18 15:09:26 UTC (rev 17667) @@ -82,7 +82,6 @@ import org.jboss.tools.common.model.ui.editors.dnd.DropData; import org.jboss.tools.common.model.ui.editors.dnd.DropUtils; import org.jboss.tools.common.model.ui.editors.dnd.IDropCommand; -import org.jboss.tools.common.model.ui.editors.dnd.JSPTagProposalFactory; import org.jboss.tools.common.model.ui.editors.dnd.context.InnerDragBuffer; import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; @@ -91,6 +90,7 @@ import org.jboss.tools.common.resref.core.ResourceReferenceListListener; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IVisualController; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory; import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.jst.web.tld.TLDUtil; import org.jboss.tools.jst.web.tld.URIConstants; --===============8542087680709210040==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 11:17:53 2009 Content-Type: multipart/mixed; boundary="===============3673272441010376498==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17668 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette. Date: Fri, 18 Sep 2009 11:17:53 -0400 Message-ID: <200909181517.n8IFHrtW032172@svn01.web.mwc.hst.phx2.redhat.com> --===============3673272441010376498== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-18 11:17:53 -0400 (Fri, 18 Sep 2009) New Revision: 17668 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/palette/PaletteInsertManager.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Initial moving jsp related dnd to jst.jsp Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/views/palette/PaletteInsertManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertManager.java 2009-09-18 15:09:= 26 UTC (rev 17667) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertManager.java 2009-09-18 15:17:= 53 UTC (rev 17668) @@ -19,7 +19,6 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.jboss.tools.common.model.ui.ModelUIPlugin; -import org.jboss.tools.jst.web.tld.URIConstants; = public class PaletteInsertManager { static PaletteInsertManager instance =3D new PaletteInsertManager(); @@ -32,8 +31,7 @@ = public String getWizardName(Properties properties) { String tagname =3D properties.getProperty("tag name"); //$NON-NLS-1$ - String uri =3D properties.getProperty(URIConstants.LIBRARY_URI); - return getWizardName(tagname, uri); + return getWizardName(tagname); } = public Object createWizardInstance(Properties properties) { @@ -51,7 +49,7 @@ } } = - private String getWizardName(String tagname, String uri) { + private String getWizardName(String tagname) { if(tagWizards =3D=3D null) { loadWizards(); } --===============3673272441010376498==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 12:12:08 2009 Content-Type: multipart/mixed; boundary="===============7281133884683110335==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17669 - tags. Date: Fri, 18 Sep 2009 12:12:08 -0400 Message-ID: <200909181612.n8IGC8ti014652@svn01.web.mwc.hst.phx2.redhat.com> --===============7281133884683110335== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2009-09-18 12:12:07 -0400 (Fri, 18 Sep 2009) New Revision: 17669 Added: tags/jbosstools-3.0.2.GA/ Log: tag for 3.0.2.GA Copied: tags/jbosstools-3.0.2.GA (from rev 17668, branches/jbosstools-3.0.x) --===============7281133884683110335==-- From jbosstools-commits at lists.jboss.org Fri Sep 18 12:56:22 2009 Content-Type: multipart/mixed; boundary="===============9083926528027744715==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17670 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist and 1 other directories. Date: Fri, 18 Sep 2009 12:56:22 -0400 Message-ID: <200909181656.n8IGuMTd024980@svn01.web.mwc.hst.phx2.redhat.com> --===============9083926528027744715== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-18 12:56:22 -0400 (Fri, 18 Sep 2009) New Revision: 17670 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/resolver/ElVarSearcher.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/XmlContentAssistProcessor.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/refactoring/SeamRefactorSearcher.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/resolver/ElVarSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ElVarSearcher.java 2009-09-18 16:12:07 UTC (rev 17= 669) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/resolver/ElVarSearcher.java 2009-09-18 16:56:22 UTC (rev 17= 670) @@ -12,6 +12,7 @@ = import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; = import org.eclipse.core.resources.IFile; @@ -121,8 +122,10 @@ try { model =3D mm.getModelForRead(file); } catch (IOException e) { + Activator.getDefault().logError(e); return null; } catch (CoreException e) { + Activator.getDefault().logError(e); return null; } } @@ -151,7 +154,7 @@ if(node!=3Dnull) { return findAllVars(node); } - return null; + return Collections.emptyList(); } = /** @@ -173,7 +176,7 @@ if(node!=3Dnull) { return findAllVars(node, resolver.getParserFactory()); } - return null; + return Collections.emptyList(); } = /** @@ -186,7 +189,7 @@ if(node!=3Dnull) { return findAllVars(node, factory); } - return null; + return Collections.emptyList(); } = /** @@ -324,5 +327,4 @@ } return null; } - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/XmlContentAssistProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/XmlContentAssistProcessor.java 2009-09-18 16:12:07 UTC (rev 17= 669) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/XmlContentAssistProcessor.java 2009-09-18 16:56:22 UTC (rev 17= 670) @@ -10,6 +10,7 @@ *************************************************************************= *****/ package org.jboss.tools.jst.jsp.contentassist; = +import java.util.Collections; import java.util.List; = import org.eclipse.core.resources.IFile; @@ -23,6 +24,7 @@ import org.jboss.tools.common.el.core.resolver.ELContext; import org.jboss.tools.common.el.core.resolver.ELContextImpl; import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; import org.jboss.tools.common.el.core.resolver.ELResolver; import org.jboss.tools.common.el.core.resolver.ElVarSearcher; import org.jboss.tools.common.el.core.resolver.Var; @@ -62,7 +64,7 @@ ELExpression operand, boolean returnEqualedVariablesOnly, List vars, ElVarSearcher varSearcher) throws BadLocationException, StringIndexOutOfBoundsException { - return null; + return new ELResolutionImpl(); } = public ELParserFactory getParserFactory() { @@ -70,11 +72,11 @@ } = public List getProposals(ELContext context, String el) { - return null; + return Collections.emptyList(); } = public ELResolution resolve(ELContext context, ELExpression operand) { - return null; + return new ELResolutionImpl(); } }; ElVarSearcher varSearcher =3D new ElVarSearcher(file, fakeEngine); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/refactoring/SeamRefactorSearcher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-18 16:12:07 UTC = (rev 17669) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/refactoring/SeamRefactorSearcher.java 2009-09-18 16:56:22 UTC = (rev 17670) @@ -387,43 +387,32 @@ } return false; } - = + private void resolve(IFile file, ELExpression operand, int offset, int le= ngth){ ELResolver[] resolvers =3D ELResolverFactoryManager.getInstance().getRes= olvers(file); - = + for(ELResolver resolver : resolvers){ if(!(resolver instanceof ELCompletionEngine)) continue; - = + SimpleELContext context =3D new SimpleELContext(); - = + context.setResource(file); context.setElResolvers(resolvers); = List vars =3D ElVarSearcher.findAllVars(context, offset, resolver); - = - if(vars =3D=3D null) - continue; - = + context.setVars(vars); = ELResolution resolution =3D resolver.resolve(context, operand); - = - if(resolution =3D=3D null) - continue; - = + ELSegment segment =3D resolution.findSegmentByOffset(offset); - = - if(segment =3D=3D null) - continue; = - if(segment instanceof JavaMemberELSegment){ + if(segment !=3D null && segment instanceof JavaMemberELSegment && segme= nt.isResolved()) { JavaMemberELSegment javaSegment =3D (JavaMemberELSegment)segment; - if(javaSegment.isResolved()){ - IJavaElement segmentJavaElement =3D javaSegment.getJavaElement(); - if(segmentJavaElement.equals(javaElement)) - match(file, offset, length); - } + IJavaElement segmentJavaElement =3D javaSegment.getJavaElement(); + if(javaElement.equals(segmentJavaElement)) + match(file, offset, length); } } } --===============9083926528027744715==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 07:40:55 2009 Content-Type: multipart/mixed; boundary="===============8921862173691487473==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17673 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: texteditors/propertyeditor and 2 other directories. Date: Mon, 21 Sep 2009 07:40:55 -0400 Message-ID: <200909211140.n8LBetQW028527@svn01.web.mwc.hst.phx2.redhat.com> --===============8921862173691487473== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 07:40:55 -0400 (Mon, 21 Sep 2009) New Revision: 17673 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/PlainTextDropCommand.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/UnknownDropCommand.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/texteditors/propertyeditor/PropertiesTextEditorStub.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/texteditors/xmleditor/XMLTextEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/palette/PaletteInsertHelper.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/palette/PaletteViewPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Splitting PaletteInsertHelper into jsp and non-jsp related parts. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/PlainTextDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/PlainTextDropCommand.java 2009-09-21 08:10:16= UTC (rev 17672) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/PlainTextDropCommand.java 2009-09-21 11:40:55= UTC (rev 17673) @@ -27,7 +27,7 @@ if(data =3D=3D null) return; Properties properties =3D new Properties(); properties.put(PaletteInsertHelper.PROPOPERTY_START_TEXT, data); - PaletteInsertHelper.insertIntoEditor( + PaletteInsertHelper.getInstance().insertIntoEditor( getDefaultModel().getDropData().getSourceViewer(), properties ); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/UnknownDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/UnknownDropCommand.java 2009-09-21 08:10:16 U= TC (rev 17672) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/UnknownDropCommand.java 2009-09-21 11:40:55 U= TC (rev 17673) @@ -28,7 +28,7 @@ fElementGenerator.setDataModel(getDefaultModel()); Properties properties =3D new Properties(); properties.put(PaletteInsertHelper.PROPOPERTY_START_TEXT,fElementGenerat= or.generateStartTag()); - PaletteInsertHelper.insertIntoEditor( + PaletteInsertHelper.getInstance().insertIntoEditor( getDefaultModel().getDropData().getSourceViewer(), properties ); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/texteditors/propertyeditor/PropertiesTextEditorStub= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/texteditors/propertyeditor/PropertiesTextEditorStub.java = 2009-09-21 08:10:16 UTC (rev 17672) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/texteditors/propertyeditor/PropertiesTextEditorStub.java = 2009-09-21 11:40:55 UTC (rev 17673) @@ -59,7 +59,7 @@ } = public void insert(Properties p) { - PaletteInsertHelper.insertIntoEditor(getSourceViewer(), p); + PaletteInsertHelper.getInstance().insertIntoEditor(getSourceViewer(), p= ); } = } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2009-09-21 08:10= :16 UTC (rev 17672) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2009-09-21 11:40= :55 UTC (rev 17673) @@ -385,7 +385,7 @@ } = public void insert(Properties p) { - PaletteInsertHelper.insertIntoEditor(getSourceViewer(), p); + PaletteInsertHelper.getInstance().insertIntoEditor(getSourceViewer(), p= ); } = public String getContext(int pos) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/views/palette/PaletteInsertHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-21 08:10:1= 6 UTC (rev 17672) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-21 11:40:5= 5 UTC (rev 17673) @@ -58,7 +58,15 @@ = static PaletteTaglibInserter PaletteTaglibInserter =3D new PaletteTagl= ibInserter(); = - public static void insertIntoEditor(ITextEditor editor, Properties p) { + static PaletteInsertHelper instance =3D new PaletteInsertHelper(); + + public static PaletteInsertHelper getInstance() { + return instance; + } = + = + public PaletteInsertHelper() {} + + public void insertIntoEditor(ITextEditor editor, Properties p) { if(editor =3D=3D null) return; if(!isEditable(editor)) { ServiceDialog d =3D PreferenceModelUtilities.getPreferenceModel().getSe= rvice(); @@ -92,7 +100,7 @@ return true; } = - public static void insertIntoEditor(final ISourceViewer v, Properties p) { + public void insertIntoEditor(final ISourceViewer v, Properties p) { String tagname =3D p.getProperty(PROPOPERTY_TAG_NAME); String startText =3D p.getProperty(PROPOPERTY_START_TEXT); String endText =3D p.getProperty(PROPOPERTY_END_TEXT); @@ -147,7 +155,7 @@ } } = - private static void insertIntoEditorInternal(IDocument doc, Properties p)= { + protected void insertIntoEditorInternal(IDocument doc, Properties p) { String startText =3D p.getProperty(PROPOPERTY_START_TEXT); String endText =3D p.getProperty(PROPOPERTY_END_TEXT); String newline =3D p.getProperty(PROPOPERTY_NEW_LINE); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/views/palette/PaletteViewPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteViewPart.java 2009-09-21 08:10:16 UT= C (rev 17672) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteViewPart.java 2009-09-21 11:40:55 UT= C (rev 17673) @@ -166,7 +166,9 @@ properties.setProperty(PaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, re= format); properties.setProperty(PaletteInsertHelper.PROPOPERTY_NEW_LINE, newline= ); properties.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTa= glib); - PaletteInsertHelper.insertIntoEditor( + = + //TODO WARNING we cannot have here correct insert helper instance! + PaletteInsertHelper.getInstance().insertIntoEditor( editor, properties ); --===============8921862173691487473==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 07:41:56 2009 Content-Type: multipart/mixed; boundary="===============5539842812007100260==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17674 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor: dnd and 1 other directory. Date: Mon, 21 Sep 2009 07:41:56 -0400 Message-ID: <200909211141.n8LBfuFk028707@svn01.web.mwc.hst.phx2.redhat.com> --===============5539842812007100260== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 07:41:56 -0400 (Mon, 21 Sep 2009) New Revision: 17674 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/JSPPaletteInsertHelper.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/JSPTextEditor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/FileDropCommand.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/PaletteDropCommand.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Splitting PaletteInsertHelper into jsp and non-jsp related parts. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/JSPTextEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPTextEditor.java 2009-09-21 11:40:55 UTC (rev 17673) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/JSPTextEditor.java 2009-09-21 11:41:56 UTC (rev 17674) @@ -126,6 +126,7 @@ import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.jst.jsp.editor.IVisualContext; import org.jboss.tools.jst.jsp.editor.IVisualController; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory; import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; import org.jboss.tools.jst.jsp.outline.JSPContentOutlineConfiguration; @@ -569,7 +570,7 @@ } = public void insert(Properties p) { - PaletteInsertHelper.insertIntoEditor(getSourceViewer(), p); + JSPPaletteInsertHelper.getInstance().insertIntoEditor(getSourceViewer()= , p); } = } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/FileDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/FileDropCommand.java 2009-09-21 11:40:55 UTC (rev 17673) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/FileDropCommand.java 2009-09-21 11:41:56 UTC (rev 17674) @@ -61,7 +61,7 @@ properties.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER, getDef= aultModel().getDropData().getSelectionProvider()); properties.put(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NO= N-NLS-1$ addCustomProperties(properties); - PaletteInsertHelper.insertIntoEditor( + JSPPaletteInsertHelper.getInstance().insertIntoEditor( getDefaultModel().getDropData().getSourceViewer(), properties ); Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/jspeditor/dnd/JSPPaletteInsertHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPPaletteInsertHelper.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPPaletteInsertHelper.java 2009-09-21 11:41:56 UTC (rev 17674) @@ -0,0 +1,15 @@ +package org.jboss.tools.jst.jsp.jspeditor.dnd; + +import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; + +public class JSPPaletteInsertHelper extends PaletteInsertHelper { + + static JSPPaletteInsertHelper instance =3D new JSPPaletteInsertHelper(); + + public static JSPPaletteInsertHelper getInstance() { + return instance; + } + + public JSPPaletteInsertHelper() {} + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jbos= s/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/PaletteDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteDropCommand.java 2009-09-21 11:40:55 UTC (rev 17673) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteDropCommand.java 2009-09-21 11:41:56 UTC (rev 17674) @@ -82,7 +82,7 @@ if(endText !=3D null) properties.setProperty(PaletteInsertHelper.PROPOP= ERTY_END_TEXT, endText); if(reformat !=3D null) properties.setProperty(PaletteInsertHelper.PROPO= PERTY_REFORMAT_BODY, reformat); if(newLine !=3D null) properties.setProperty(PaletteInsertHelper.PROPOP= ERTY_NEW_LINE, newLine); - PaletteInsertHelper.insertIntoEditor( + PaletteInsertHelper.getInstance().insertIntoEditor( getDefaultModel().getDropData().getSourceViewer(), properties ); --===============5539842812007100260==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 07:42:44 2009 Content-Type: multipart/mixed; boundary="===============1260885347222849077==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17675 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: toolbar/format/handler and 1 other directories. Date: Mon, 21 Sep 2009 07:42:44 -0400 Message-ID: <200909211142.n8LBgiX2028819@svn01.web.mwc.hst.phx2.redhat.com> --===============1260885347222849077== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 07:42:44 -0400 (Mon, 21 Sep 2009) New Revision: 17675 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/men= u/action/InsertAction.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/men= u/action/InsertAction2.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/too= lbar/format/handler/FormatHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/uti= l/VpeDndUtil.java Log: Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/menu/action/InsertAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction.java 2009-09-21 11:41:56 UTC (rev 17674) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction.java 2009-09-21 11:42:44 UTC (rev 17675) @@ -19,6 +19,7 @@ import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.URIConstants; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -145,7 +146,7 @@ */ // if(((Node)region).getNodeType() =3D=3D Node.ELEMENT_NODE) p.put("selectionProvider", selProvider); //$NON-NLS-1$ - PaletteInsertHelper.insertIntoEditor(sourceEditor.getTextViewer(), p); + JSPPaletteInsertHelper.getInstance().insertIntoEditor(sourceEditor.getTe= xtViewer(), p); } = /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/menu/action/InsertAction2.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction2.java 2009-09-21 11:41:56 UTC (rev 17674) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction2.java 2009-09-21 11:42:44 UTC (rev 17675) @@ -19,6 +19,7 @@ import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.URIConstants; import org.jboss.tools.vpe.editor.menu.InsertType; @@ -215,7 +216,7 @@ // if(((Node)region).getNodeType() =3D=3D Node.ELEMENT_NODE) p.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER, selectionProvider); - PaletteInsertHelper.insertIntoEditor(sourceEditor.getTextViewer(), p); + JSPPaletteInsertHelper.getInstance().insertIntoEditor(sourceEditor.getTe= xtViewer(), p); } = /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/toolbar/format/handler/FormatHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/format/handler/FormatHandler.java 2009-09-21 11:41:56 UTC (rev 17674) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/format/handler/FormatHandler.java 2009-09-21 11:42:44 UTC (rev 17675) @@ -26,6 +26,7 @@ import org.w3c.dom.NodeList; = import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.template.textformating.FormatData; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; @@ -121,7 +122,7 @@ = p.put("selectionProvider", selProvider); //$NON-NLS-1$ = - PaletteInsertHelper.insertIntoEditor(viewer, p); + JSPPaletteInsertHelper.getInstance().insertIntoEditor(viewer, p); = String documentText =3D document.get(); int newStartOffset =3D documentText.substring(startOffcet).indexOf(nodeS= ource); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/util/VpeDndUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/VpeDndUtil.java 2009-09-21 11:41:56 UTC (rev 17674) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/VpeDndUtil.java 2009-09-21 11:42:44 UTC (rev 17675) @@ -18,6 +18,7 @@ import org.jboss.tools.common.model.ui.dnd.DnDUtil; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.vpe.VpePlugin; import org.mozilla.interfaces.nsIFile; import org.mozilla.interfaces.nsISupports; @@ -42,7 +43,7 @@ = try { DnDUtil.paste(input.getXModelObject(), properties); - PaletteInsertHelper.insertIntoEditor(viewer, properties); + JSPPaletteInsertHelper.getInstance().insertIntoEditor(viewer, proper= ties); } catch (XModelException ex) { VpePlugin.getPluginLog().logError(ex); } --===============1260885347222849077==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 08:30:56 2009 Content-Type: multipart/mixed; boundary="===============8388660204631097980==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17676 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: problem and 1 other directories. Date: Mon, 21 Sep 2009 08:30:56 -0400 Message-ID: <200909211230.n8LCUuCH006734@svn01.web.mwc.hst.phx2.redhat.com> --===============8388660204631097980== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 08:30:56 -0400 (Mon, 21 Sep 2009) New Revision: 17676 Removed: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/CssLinkAttributeValueLoader.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/palette/PaletteTaglibInserter.java Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/problem/ProblemDialog.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/palette/PaletteInsertHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Splitting PaletteInsertHelper into jsp and non-jsp related parts. Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/editors/dnd/CssLinkAttributeValueLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/CssLinkAttributeValueLoader.java 2009-09-21 1= 1:42:44 UTC (rev 17675) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/CssLinkAttributeValueLoader.java 2009-09-21 1= 2:30:56 UTC (rev 17676) @@ -1,25 +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.model.ui.editors.dnd; - -public class CssLinkAttributeValueLoader extends AbsoluteFilePathAttribute= ValueLoader { - - public CssLinkAttributeValueLoader(String pathAttributeName) { - super(pathAttributeName, null, null); - } - - public void fillTagAttributes(IDropWizardModel model) { - super.fillTagAttributes(model); - model.setAttributeValue("rel", "stylesheet"); //$NON-NLS-1$ //$NON-NLS-2$ - model.setAttributeValue("type", "text/css"); //$NON-NLS-1$ //$NON-NLS-2$ - } - -} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/problem/ProblemDialog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/problem/ProblemDialog.java 2009-09-21 11:42:44 UTC (rev 1= 7675) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/problem/ProblemDialog.java 2009-09-21 12:30:56 UTC (rev 1= 7676) @@ -76,12 +76,6 @@ super.buttonPressed(buttonId); } = -/* - public static int open(Shell shell, String message) { - JspPreviewErrorDialog dialog =3D new JspPreviewErrorDialog(shell, JspPre= viewMessages.getString(DEFAULT_TITLE), message); - return dialog.open(); = - } -*/ /* (non-Javadoc) * @see org.eclipse.jface.window.Window#open() */ Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/views/palette/PaletteInsertHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-21 11:42:4= 4 UTC (rev 17675) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-21 12:30:5= 6 UTC (rev 17676) @@ -56,8 +56,6 @@ public static final String PROPOPERTY_SELECTION_PROVIDER =3D "selectionPr= ovider"; //$NON-NLS-1$ public static final String PROPOPERTY_ADD_TAGLIB =3D TLDToPaletteHelpe= r.ADD_TAGLIB; = - static PaletteTaglibInserter PaletteTaglibInserter =3D new PaletteTagl= ibInserter(); - static PaletteInsertHelper instance =3D new PaletteInsertHelper(); = public static PaletteInsertHelper getInstance() { @@ -101,10 +99,8 @@ } = public void insertIntoEditor(final ISourceViewer v, Properties p) { - String tagname =3D p.getProperty(PROPOPERTY_TAG_NAME); String startText =3D p.getProperty(PROPOPERTY_START_TEXT); String endText =3D p.getProperty(PROPOPERTY_END_TEXT); - String uri =3D p.getProperty(PROPOPERTY_TAGLIBRARY_URI); = ISelectionProvider selProvider = =3D (ISelectionProvider)p.get(PROPOPERTY_SELECTION_PROVIDER); @@ -113,18 +109,12 @@ } = IDocument d =3D v.getDocument(); + = String[] texts =3D new String[] {startText, endText}; + + //do any auxiliary job here + modify(v, p, texts); = - if(startText !=3D null && startText.startsWith("<%@ taglib")) { //$NON-N= LS-1$ - if(PaletteTaglibInserter.inserTaglibInXml(v, p)) { - return; - } - } else { - p =3D PaletteTaglibInserter.inserTaglib(v, p); - } - = - String defaultPrefix =3D p.getProperty(PROPOPERTY_DEFAULT_PREFIX); - applyPrefix(texts, d, tagname, uri, defaultPrefix); = startText =3D texts[0]; endText =3D texts[1]; = @@ -155,6 +145,10 @@ } } = + protected void modify(ISourceViewer v, Properties p, String[] texts) { + //override + } + protected void insertIntoEditorInternal(IDocument doc, Properties p) { String startText =3D p.getProperty(PROPOPERTY_START_TEXT); String endText =3D p.getProperty(PROPOPERTY_END_TEXT); @@ -496,102 +490,4 @@ } } = - /** - * adding prefix to tag - */ - public static void applyPrefix(String[] text, ITextEditor editor, String = tagname, String uri, String defaultPrefix) { - if(defaultPrefix =3D=3D null || defaultPrefix.length() =3D=3D 0) return; - IDocument doc =3D null; - if(editor !=3D null && editor.getDocumentProvider() !=3D null) { - doc =3D editor.getDocumentProvider().getDocument(editor.getEditorInp= ut()); - } - applyPrefix(text, doc, tagname, uri, defaultPrefix); - } - - public static void applyPrefix(String[] text, IDocument doc, String tagna= me, String uri, String defaultPrefix) { - if(doc =3D=3D null) return; - String body =3D doc.get(); - applyPrefix(text, body, tagname, uri, defaultPrefix); - } - - public static void applyPrefix(String[] text, String body, String tagname= , String uri, String defaultPrefix) { - if(uri =3D=3D null || uri.length() =3D=3D 0) return; - Properties p =3D getPrefixes(body); - String prefix =3D p.getProperty(uri, defaultPrefix); - if(prefix =3D=3D null || prefix.length() =3D=3D 0) return; = - for (int i =3D 0; i < text.length; i++) text[i] =3D applyPrefix(text[i],= tagname, prefix, p); - } - - static String applyPrefix(String text, String tagname, String prefix, Pro= perties prefixes) { - if(text =3D=3D null || text.length() =3D=3D 0) return text; - if(tagname =3D=3D null || tagname.length() =3D=3D 0) return text; - while(true) { - int i =3D text.indexOf("%prefix|"); //$NON-NLS-1$ - if(i < 0) break; - int j =3D text.indexOf("%", i + 8); //$NON-NLS-1$ - if(j < 0) break; - int j1 =3D text.indexOf("|", i + 8); //$NON-NLS-1$ - String uri =3D ""; //$NON-NLS-1$ - String defaultPrefix =3D ""; //$NON-NLS-1$ - String pr =3D ""; //$NON-NLS-1$ - uri =3D text.substring(i + 8, j1); - defaultPrefix =3D text.substring(j1 + 1, j); - pr =3D prefixes.getProperty(uri, defaultPrefix); - if(pr.length() > 0) { - text =3D text.substring(0, i) + pr + ":" + text.substring(j + 1); //$N= ON-NLS-1$ - } else { - text =3D text.substring(0, i) + text.substring(j + 1); - } - } - - int k =3D text.toLowerCase().indexOf(":" + tagname.toLowerCase()); //$NO= N-NLS-1$ - if(k >=3D 0) { - int g =3D text.indexOf("=3D 0 && g < k) { - return text.substring(0, g + 2) + prefix + text.substring(k); - } - g =3D text.indexOf("<"); //$NON-NLS-1$ - if(g >=3D 0 && g < k) { - return text.substring(0, g + 1) + prefix + text.substring(k); - } - } - k =3D text.toLowerCase().indexOf("<" + tagname.toLowerCase()); //$NON-NL= S-1$ - if(k >=3D 0) { - return text.substring(0, k + 1) + prefix + ":" + text.substring(k + 1);= //$NON-NLS-1$ - } - k =3D text.toLowerCase().indexOf("=3D 0) { - return text.substring(0, k + 2) + prefix + ":" + text.substring(k + 2);= //$NON-NLS-1$ - } - return text; - } - - static Properties getPrefixes(String body) { - Properties p =3D new Properties(); - int i =3D 0; - while(i >=3D 0 && i < body.length()) { - i =3D body.indexOf("<%@ taglib ", i); //$NON-NLS-1$ - if(i < 0) break; - int j =3D body.indexOf("%>", i); //$NON-NLS-1$ - if(j < 0) j =3D body.length(); - String taglib =3D body.substring(i, j); - getPrefix(p, taglib); - i =3D j + 1; - } - return p; - } - - static void getPrefix(Properties p, String taglib) { - int i =3D taglib.indexOf("uri=3D\""); //$NON-NLS-1$ - if(i < 0) return; - int j =3D taglib.indexOf("\"", i + 5); //$NON-NLS-1$ - if(j < 0) return; - String uri =3D taglib.substring(i + 5, j); - i =3D taglib.indexOf("prefix=3D\""); //$NON-NLS-1$ - if(i < 0) return; - j =3D taglib.indexOf("\"", i + 8); //$NON-NLS-1$ - if(j < 0) return; - String prefix =3D taglib.substring(i + 8, j); - p.setProperty(uri, prefix); - } } \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/views/palette/PaletteTaglibInserter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteTaglibInserter.java 2009-09-21 11:42= :44 UTC (rev 17675) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteTaglibInserter.java 2009-09-21 12:30= :56 UTC (rev 17676) @@ -1,403 +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.model.ui.views.palette; - -import java.util.HashMap; -import java.util.List; -import java.util.Properties; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManage= r; -import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; -import org.eclipse.wst.xml.core.internal.document.DocumentImpl; -import org.eclipse.wst.xml.core.internal.document.ElementImpl; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.jboss.tools.common.model.ui.ModelUIPlugin; -import org.jboss.tools.jst.web.tld.TaglibData; -import org.jboss.tools.jst.web.tld.VpeTaglibManager; -import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -public class PaletteTaglibInserter { - - private static final String JSP_SOURCE_ROOT_ELEMENT =3D "jsp:root"; //$NO= N-NLS-1$ - public static final String JSP_URI =3D "http://java.sun.com/JSP/Page"; //= $NON-NLS-1$ - public static final String faceletUri =3D "http://java.sun.com/jsf/facele= ts"; //$NON-NLS-1$ - - private static final String TAGLIB_START =3D "<%@ taglib"; //$NON-NLS-1$ - - public Properties inserTaglib(ISourceViewer v, Properties p) { - if(!inserTaglibInXml(v, p)) { - inserTaglibInOldJsp(v, p); - } - return p; - } - - private boolean checkProperties(Properties p) { - return "true".equalsIgnoreCase(p.getProperty(PaletteInsertHelper.PROPOPE= RTY_ADD_TAGLIB)) && //$NON-NLS-1$ - p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI) !=3D null= && - p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).length() = > 0 && - !p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).equals(J= SP_URI) && - p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX) !=3D null= && - p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX).length() = > 0 && - p.getProperty(PaletteInsertHelper.PROPOPERTY_START_TEXT) !=3D null; - } - - public boolean inserTaglibInOldJsp(ISourceViewer v, Properties p) { - if(!checkProperties(p)) { - return false; - } - - IDocument d =3D v.getDocument(); - IStructuredModel model =3D null; - - try { - model =3D StructuredModelManager.getModelManager().getExistingModelForR= ead(d); - IDOMDocument xmlDocument =3D (model instanceof IDOMModel) ? ((IDOMModel= ) model).getDocument() : null; - if (xmlDocument =3D=3D null) { - return false; - } - Properties tl =3D getPrefixes(v); - if(tl =3D=3D null) tl =3D PaletteInsertHelper.getPrefixes(d.get()); - Element root =3D xmlDocument.getDocumentElement(); - - String uri_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRAR= Y_URI); - String defaultPrefix_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY= _DEFAULT_PREFIX); - String lineDelimiter =3D PaletteInsertHelper.getLineDelimiter(d); - StringBuffer tg =3D new StringBuffer(TAGLIB_START).append(" uri=3D\"").= append(uri_p).append("\"").append(" prefix=3D\"").append(defaultPrefix_p).a= ppend("\"%>").append(lineDelimiter); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS= -3$ //$NON-NLS-4$ - - if (tl !=3D null && !tl.isEmpty()) { - //If taglib already exist check the prefix if changed - if (tl.containsKey(uri_p)) { - if (!tl.get(uri_p).equals(defaultPrefix_p)) { - p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String= )tl.get(uri_p)); - } - } else if(!tl.containsValue(defaultPrefix_p)) { - if (checkplace(xmlDocument, d, "jsp:directive.taglib", tg, p, v) =3D= =3D false) { //$NON-NLS-1$ - d.replace(0, 0, tg.toString()); - mouveFocusOnPage(p,v, tg.toString().length(), 0); - return true; - } - } - } else if(xmlDocument instanceof DocumentImpl) { - DocumentImpl docImpl =3D (DocumentImpl)xmlDocument; - // Only for JSP - if(docImpl.isJSPType()) { - if (checkplace(xmlDocument, d, "jsp:directive.page", tg, p, v) =3D=3D= false) { //$NON-NLS-1$ - d.replace(0, 0, tg.toString()); - mouveFocusOnPage(p,v, tg.toString().length(), 0); - return true; - } - } - } - } catch (BadLocationException e) { - ModelUIPlugin.getPluginLog().logError(e); - } finally { - if (model !=3D null) model.releaseFromRead(); - } - return false; - } - = - private static Node getSelectedNode(ISourceViewer v, Properties p){ - ISelectionProvider selProvider =3D (ISelectionProvider)p.get(PaletteInse= rtHelper.PROPOPERTY_SELECTION_PROVIDER); - if(selProvider =3D=3D null) return null; - = - ITextSelection selection =3D null; - = - if(selProvider.getSelection() instanceof ITextSelection) - selection =3D (ITextSelection)selProvider.getSelection(); - else return null; - = - IndexedRegion region =3D ContentAssistUtils.getNodeAt(v, selection.getOf= fset()); - if(region =3D=3D null) return null; - = - if(!(region instanceof Node)) return null; - = - Node text =3D (Node)region; - = - = - if("#text".equals(text.getNodeName())) //$NON-NLS-1$ - return text.getParentNode(); - else - return text; - } - = - private static boolean checkSelectedElement(HashMap map, I= SourceViewer v, Properties p){ - String taglibUri =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIB= RARY_URI); - if(taglibUri =3D=3D null) return false; - = - Node selectedNode =3D getSelectedNode(v, p); - if(selectedNode =3D=3D null) return false; - = - return checkElement(map, selectedNode, taglibUri); - } - = - private static boolean checkElement(HashMap map, Node node= , String taglibUri){ - = - NamedNodeMap attrs =3D node.getAttributes(); - for (int j =3D 0; attrs !=3D null && j < attrs.getLength(); j++) { - Node a =3D attrs.item(j); - String name =3D a.getNodeName(); - - if (name.startsWith("xmlns:")) { //$NON-NLS-1$ - map.put(a.getNodeValue(), name.substring("xmlns:".length())); //$NON-N= LS-1$ - } - } - - if (map.containsKey(taglibUri)) return true; - else{ - if(node.getParentNode() =3D=3D null) return false; - else return checkElement(map, node.getParentNode(), taglibUri); - } - } - - public boolean inserTaglibInXml(ISourceViewer v, Properties p) { - if(!checkProperties(p)) { - return false; - } - = - IDocument d =3D v.getDocument(); - IStructuredModel model =3D null; - = - try { - model =3D StructuredModelManager.getModelManager().getExistingModelForR= ead(d); - IDOMDocument xmlDocument =3D (model instanceof IDOMModel) ? ((IDOMModel= ) model).getDocument() : null; - = - if (xmlDocument =3D=3D null) { - return false; - } - = - Properties tl =3D getPrefixes(v); - if(tl =3D=3D null) tl =3D PaletteInsertHelper.getPrefixes(d.get()); - Element root =3D xmlDocument.getDocumentElement(); - if(root !=3D null) { - // for xhtml and jsp:root = - if (xmlDocument.getDoctype() !=3D null /* && tagLibListConainsFacelet(= tl)*/ ) { - String publicId =3D xmlDocument.getDoctype().getPublicId(); - if (publicId!=3Dnull && publicId.toUpperCase().startsWith("-//W3C//DT= D XHTML")) { // && root.getNodeName().equalsIgnoreCase(HTML_SOURCE_ROOT_ELE= MENT)) { //$NON-NLS-1$ - checkTL(root, v, p, d); - return true; - } - } else if(xmlDocument.isXMLType() || root.getNodeName().equals(JSP_SOU= RCE_ROOT_ELEMENT)) { - checkTL(root, v, p, d); - return true; - } - } - } finally { - if (model !=3D null) model.releaseFromRead(); - } - return false; - } - -// private static boolean tagLibListConainsFacelet(List tagLibList) { -// if (tagLibList !=3D null && !tagLibList.isEmpty()) { -// for (int i =3D 0; i < tagLibList.size(); i++) { -// TaglibData tgld =3D (TaglibData)tagLibList.get(i); -// if(faceletUri.equals(tgld.getUri())) { -// return true; -// } -// } -// } -// return false; -// } - - /* - * analyse source for taglib, return the list of taglib - */ - private static Properties getPrefixes(ISourceViewer viewer) { - VpeTaglibManager tldManager =3D null; - if((tldManager =3D=3D null) && (viewer instanceof VpeTaglibManagerProvid= er)) { - tldManager =3D ((VpeTaglibManagerProvider)viewer).getTaglibManager(); - if(tldManager !=3D null) { - List list =3D tldManager.getTagLibs(); - Properties p =3D new Properties(); - for (int i =3D 0; i < list.size(); i++) { - TaglibData data =3D (TaglibData)list.get(i); - p.setProperty(data.getUri(), data.getPrefix()); - } - return p; - } = - } - return null; - } - - /* - * for jsp:root and html check the taglib if exist check the prefix else = add the taglib - * with text formatting - */ - private static Properties checkTL(Element root, ISourceViewer v, Properti= es p, IDocument d) { - String uri_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY= _URI); - String defaultPrefix_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_= DEFAULT_PREFIX); - - HashMap map =3D new HashMap(); - NamedNodeMap attrs =3D root.getAttributes(); - for (int j =3D 0; attrs !=3D null && j < attrs.getLength(); j++) { - Node a =3D attrs.item(j); - String name =3D a.getNodeName(); - - if (name.startsWith("xmlns:")) { //$NON-NLS-1$ - map.put(a.getNodeValue(), name.substring("xmlns:".length())); //$NON-N= LS-1$ - } - } - = - if (map.containsKey(uri_p) || checkSelectedElement(map, v, p)) { - if (!map.get(uri_p).equals(defaultPrefix_p)) { - p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String) = map.get(uri_p)); - } - } else if(!map.containsValue(defaultPrefix_p)) { - StringBuffer attribute =3D new StringBuffer("xmlns:").append(defaultPre= fix_p).append("=3D\"").append(uri_p).append("\""); //$NON-NLS-1$ //$NON-NL= S-2$ //$NON-NLS-3$ - int so =3D ((IDOMElement)root).getStartOffset(); - int seo =3D ((IDOMElement)root).getStartEndOffset(); - try { - String lineDelimiter =3D PaletteInsertHelper.getLineDelimiter(d); - StringBuffer selectedSource =3D new StringBuffer().append(d.get(so, se= o-so)); - int xmlns =3D selectedSource.indexOf("xmlns"); //$NON-NLS-1$ - attribute =3D new StringBuffer().append(createEmptyCharArray(xmlns)).a= ppend("xmlns:").append(defaultPrefix_p).append("=3D\"").append(uri_p).appen= d("\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - if (d.getLineOffset(d.getLineOfOffset(so)) !=3D so) { = - attribute.insert(0, analyseSubstring(d.get(d.getLineOffset(d.getLineO= fOffset(so)), so-d.getLineOffset(d.getLineOfOffset(so))))); - } = - if(xmlns>0) { - attribute.insert(0, lineDelimiter); - } else { - attribute.insert(0, ' '); - } - selectedSource.insert(selectedSource.length()-1, attribute); - d.replace(so, seo-so, selectedSource.toString()); - } catch (BadLocationException t) { - ModelUIPlugin.getPluginLog().logError("", t); //$NON-NLS-1$ - } - } - return p; - } - - private static char[] createEmptyCharArray(int n){ - if(n<1) { - return new char[0]; - } - char[] ca =3D new char[n]; - for (int i =3D 0; i < n; i++) - ca[i]=3D' '; - return ca; - } - - private static void mouveFocusOnPage(Properties p, ISourceViewer v, int l= ength, int pos){ - ISelectionProvider selProvider =3D (ISelectionProvider)p.get(PaletteInse= rtHelper.PROPOPERTY_SELECTION_PROVIDER); - IDocument doc =3D v.getDocument(); - - if (doc=3D=3D null || selProvider =3D=3D null) return; - - ITextSelection selection =3D (ITextSelection)selProvider.getSelection(); - if (selection.getOffset() =3D=3D 0) { = - v.setSelectedRange(length,0); - p.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER,v.getSelection= Provider()); - } - else = - if (selection.getOffset() =3D=3D pos ){ - v.setSelectedRange(length, 0); - p.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER,v.getSelectionP= rovider()); - } - } - - /* - * analyse the space between the left corner and the start offset o the t= ext - */ = - private static StringBuffer analyseSubstring(String str){ - StringBuffer st =3D new StringBuffer().append(str); = - for (int i =3D 0; i < st.length(); i++) { - if (st.charAt(i) !=3D ' ' && st.charAt(i) !=3D'\t' ) { - st.setCharAt(i, ' '); - } - } - return st; = - } - - private static boolean checkplace(IDOMDocument xmlDocument, IDocument d, = String st, StringBuffer tg, Properties p, ISourceViewer v) throws BadLocati= onException { - NodeList nl =3D xmlDocument.getChildNodes(); - boolean docType =3D false; - IndexedRegion irdt =3D null; - - if (xmlDocument.getDoctype() !=3D null) { - docType =3D true; - String publicId =3D xmlDocument.getDoctype().getPublicId(); - if (publicId!=3Dnull && publicId.toUpperCase().startsWith("-//W3C//DTD = HTML")) { //$NON-NLS-1$ - irdt =3D (xmlDocument.getDoctype() instanceof IndexedRegion) ? - (IndexedRegion)xmlDocument.getDoctype(): null; - } - } - - if (nl !=3D null && nl.getLength() !=3D 0) { - for (int i=3D0; i < nl.getLength(); i++) { - Node n =3D nl.item(i); - //fing the first taglib to insert before - if (n.getNodeName().equals(st) && st.equals("jsp:directive.taglib")) {= //$NON-NLS-1$ - //calculate the space between taglib and left page corner - int so =3D ((ElementImpl)n).getStartOffset(); - //taglib is at left corner = - if (d.getLineOffset(d.getLineOfOffset(so)) =3D=3D so) { - d.replace(so, 0, tg.toString()); - } else { - StringBuffer left =3D new StringBuffer(). - append(analyseSubstring(d.get(d.getLineOffset(d.getLineOfOffset(so))= , so-d.getLineOffset(d.getLineOfOffset(so))))); - tg.insert(tg.length(), left); - d.replace(so, 0, tg.toString()); - } - return true; - } - if ((n.getNodeName().equals(st) && st.equals("jsp:directive.page")) ) = { //$NON-NLS-1$ - tg.delete(tg.lastIndexOf(PaletteInsertHelper.getLineDelimiter(d)), tg= .length()); - int so =3D ((ElementImpl)n).getStartOffset(); - int eo =3D ((ElementImpl)n).getEndStartOffset(); - StringBuffer tgleft =3D new StringBuffer().append(PaletteInsertHelper= .getLineDelimiter(d)); - if (d.getLineOffset(d.getLineOfOffset(so)) =3D=3D so) { - tgleft.append(tg); - d.replace(eo, 0, tgleft.toString()); - mouveFocusOnPage(p,v, eo + tgleft.length(), eo); - } else { - tgleft.append(analyseSubstring(d.get(d.getLineOffset(d.getLineOfOffs= et(so)), so-d.getLineOffset(d.getLineOfOffset(so))))); - tgleft.append(tg); - d.replace(eo, 0, tgleft.toString()); - mouveFocusOnPage(p,v, eo + tgleft.length(), eo); - } - return true; - } - if (docType && irdt !=3D null) { - tg.delete(tg.lastIndexOf(PaletteInsertHelper.getLineDelimiter(d)), tg= .length()); - int so =3D irdt.getStartOffset(); - int eo =3D irdt.getEndOffset(); - StringBuffer tgleft =3D new StringBuffer().append(PaletteInsertHelper= .getLineDelimiter(d)); - if (d.getLineOffset(d.getLineOfOffset(so)) =3D=3D so) { - tgleft.append(tg); - d.replace(eo, 0, tgleft.toString()); - mouveFocusOnPage(p,v, eo + tgleft.length(), eo); - } else { - tgleft.append(analyseSubstring(d.get(d.getLineOffset(d.getLineOfOffs= et(so)), so-d.getLineOffset(d.getLineOfOffset(so))))); - tgleft.append(tg); - d.replace(eo, 0, tgleft.toString()); - mouveFocusOnPage(p,v, eo + tgleft.length(), eo); - } - return true; - } - } - } - return false; - } -} \ No newline at end of file --===============8388660204631097980==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 08:31:32 2009 Content-Type: multipart/mixed; boundary="===============0975204043125140125==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17677 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: menu and 1 other directory. Date: Mon, 21 Sep 2009 08:31:32 -0400 Message-ID: <200909211231.n8LCVWXW006960@svn01.web.mwc.hst.phx2.redhat.com> --===============0975204043125140125== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 08:31:32 -0400 (Mon, 21 Sep 2009) New Revision: 17677 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= Controller.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/men= u/MenuCreationHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Splitting PaletteInsertHelper into jsp and non-jsp related parts. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2009-09-21 12:30:56 UTC (rev 17676) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2009-09-21 12:31:32 UTC (rev 17677) @@ -90,6 +90,7 @@ import org.jboss.tools.common.resref.core.ResourceReferenceListListener; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IVisualController; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory; import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.jst.web.tld.TLDUtil; @@ -2233,7 +2234,7 @@ String defaultPrefix =3D (parent =3D=3D null) ? "" : parent.getAttribute= Value(URIConstants.DEFAULT_PREFIX); //$NON-NLS-1$ = String[] texts =3D new String[] { "<" + tagname + ">" }; //$NON-NLS-1$ /= /$NON-NLS-2$ - PaletteInsertHelper.applyPrefix(texts, sourceEditor, tagname, uri, + JSPPaletteInsertHelper.applyPrefix(texts, sourceEditor, tagname, uri, defaultPrefix); tagname =3D texts[0].substring(1, texts[0].length() - 1); = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/menu/MenuCreationHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/MenuCreationHelper.java 2009-09-21 12:30:56 UTC (rev 17676) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/MenuCreationHelper.java 2009-09-21 12:31:32 UTC (rev 17677) @@ -32,6 +32,7 @@ import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; import org.jboss.tools.common.model.util.ModelFeatureFactory; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.jst.web.tld.URIConstants; import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; @@ -509,7 +510,7 @@ String tagName =3D item.getAttributeValue("name"); //$NON-NLS-1$ String[] texts =3D new String[] { "<" + tagName + ">" }; //$NON-NLS-1$ /= /$NON-NLS-2$ if (tagName.indexOf("taglib") < 0) { //$NON-NLS-1$ - PaletteInsertHelper.applyPrefix(texts, sourceEditor, tagName, uri, defa= ultPrefix); + JSPPaletteInsertHelper.applyPrefix(texts, sourceEditor, tagName, uri, d= efaultPrefix); } tagName =3D texts[0]; = --===============0975204043125140125==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 08:32:55 2009 Content-Type: multipart/mixed; boundary="===============3938968021695345626==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17678 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd. Date: Mon, 21 Sep 2009 08:32:55 -0400 Message-ID: <200909211232.n8LCWtjP007581@svn01.web.mwc.hst.phx2.redhat.com> --===============3938968021695345626== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 08:32:55 -0400 (Mon, 21 Sep 2009) New Revision: 17678 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/CssLinkAttributeValueLoader.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/PaletteTaglibInserter.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/FileTagProposalLoader.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/JSPPaletteInsertHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Splitting PaletteInsertHelper into jsp and non-jsp related parts. Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/jspeditor/dnd/CssLinkAttributeValueLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/CssLinkAttributeValueLoader.java (rev = 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/CssLinkAttributeValueLoader.java 2009-09-21 12:32:55 UTC (rev = 17678) @@ -0,0 +1,28 @@ +/*************************************************************************= ****** + * 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.jsp.jspeditor.dnd; + +import org.jboss.tools.common.model.ui.editors.dnd.AbsoluteFilePathAttribu= teValueLoader; +import org.jboss.tools.common.model.ui.editors.dnd.IDropWizardModel; + +public class CssLinkAttributeValueLoader extends AbsoluteFilePathAttribute= ValueLoader { + + public CssLinkAttributeValueLoader(String pathAttributeName) { + super(pathAttributeName, null, null); + } + + public void fillTagAttributes(IDropWizardModel model) { + super.fillTagAttributes(model); + model.setAttributeValue("rel", "stylesheet"); //$NON-NLS-1$ //$NON-NLS-2$ + model.setAttributeValue("type", "text/css"); //$NON-NLS-1$ //$NON-NLS-2$ + } + +} Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/FileTagProposalLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/FileTagProposalLoader.java 2009-09-21 12:31:32 UTC (rev 17677) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/FileTagProposalLoader.java 2009-09-21 12:32:55 UTC (rev 17678) @@ -14,7 +14,6 @@ import java.util.Map; = import org.jboss.tools.common.model.ui.editors.dnd.AbsoluteFilePathAttribu= teValueLoader; -import org.jboss.tools.common.model.ui.editors.dnd.CssLinkAttributeValueLo= ader; import org.jboss.tools.common.model.ui.editors.dnd.DropURI; import org.jboss.tools.common.model.ui.editors.dnd.IAttributeValueLoader; import org.jboss.tools.common.model.ui.editors.dnd.IDropWizardModel; @@ -22,7 +21,6 @@ import org.jboss.tools.common.model.ui.editors.dnd.ITagProposalLoader; import org.jboss.tools.common.model.ui.editors.dnd.LoadBundleBaseNameAttri= buteValueLoader; import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; -import org.jboss.tools.common.model.ui.views.palette.PaletteTaglibInserter; = public class FileTagProposalLoader implements ITagProposalLoader { = Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/JSPPaletteInsertHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPPaletteInsertHelper.java 2009-09-21 12:31:32 UTC (rev 17677) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPPaletteInsertHelper.java 2009-09-21 12:32:55 UTC (rev 17678) @@ -1,5 +1,10 @@ package org.jboss.tools.jst.jsp.jspeditor.dnd; = +import java.util.Properties; + +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; = public class JSPPaletteInsertHelper extends PaletteInsertHelper { @@ -10,6 +15,126 @@ return instance; } = - public JSPPaletteInsertHelper() {} + static PaletteTaglibInserter PaletteTaglibInserter =3D new PaletteTagl= ibInserter(); = + public JSPPaletteInsertHelper() {} + + protected void modify(ISourceViewer v, Properties p, String[] texts) { + String tagname =3D p.getProperty(PROPOPERTY_TAG_NAME); + String uri =3D p.getProperty(PROPOPERTY_TAGLIBRARY_URI); + String startText =3D texts[0]; + if(startText !=3D null && startText.startsWith("<%@ taglib")) { //$NON-N= LS-1$ + if(PaletteTaglibInserter.inserTaglibInXml(v, p)) { + return; + } + } else { + p =3D PaletteTaglibInserter.inserTaglib(v, p); + } + = + String defaultPrefix =3D p.getProperty(PROPOPERTY_DEFAULT_PREFIX); + IDocument d =3D v.getDocument(); + applyPrefix(texts, d, tagname, uri, defaultPrefix); = + } + + + + /** + * adding prefix to tag + */ + public static void applyPrefix(String[] text, ITextEditor editor, String = tagname, String uri, String defaultPrefix) { + if(defaultPrefix =3D=3D null || defaultPrefix.length() =3D=3D 0) return; + IDocument doc =3D null; + if(editor !=3D null && editor.getDocumentProvider() !=3D null) { + doc =3D editor.getDocumentProvider().getDocument(editor.getEditorInp= ut()); + } + applyPrefix(text, doc, tagname, uri, defaultPrefix); + } + + public static void applyPrefix(String[] text, IDocument doc, String tagna= me, String uri, String defaultPrefix) { + if(doc =3D=3D null) return; + String body =3D doc.get(); + applyPrefix(text, body, tagname, uri, defaultPrefix); + } + + public static void applyPrefix(String[] text, String body, String tagname= , String uri, String defaultPrefix) { + if(uri =3D=3D null || uri.length() =3D=3D 0) return; + Properties p =3D getPrefixes(body); + String prefix =3D p.getProperty(uri, defaultPrefix); + if(prefix =3D=3D null || prefix.length() =3D=3D 0) return; = + for (int i =3D 0; i < text.length; i++) text[i] =3D applyPrefix(text[i],= tagname, prefix, p); + } + + static String applyPrefix(String text, String tagname, String prefix, Pro= perties prefixes) { + if(text =3D=3D null || text.length() =3D=3D 0) return text; + if(tagname =3D=3D null || tagname.length() =3D=3D 0) return text; + while(true) { + int i =3D text.indexOf("%prefix|"); //$NON-NLS-1$ + if(i < 0) break; + int j =3D text.indexOf("%", i + 8); //$NON-NLS-1$ + if(j < 0) break; + int j1 =3D text.indexOf("|", i + 8); //$NON-NLS-1$ + String uri =3D ""; //$NON-NLS-1$ + String defaultPrefix =3D ""; //$NON-NLS-1$ + String pr =3D ""; //$NON-NLS-1$ + uri =3D text.substring(i + 8, j1); + defaultPrefix =3D text.substring(j1 + 1, j); + pr =3D prefixes.getProperty(uri, defaultPrefix); + if(pr.length() > 0) { + text =3D text.substring(0, i) + pr + ":" + text.substring(j + 1); //$N= ON-NLS-1$ + } else { + text =3D text.substring(0, i) + text.substring(j + 1); + } + } + + int k =3D text.toLowerCase().indexOf(":" + tagname.toLowerCase()); //$NO= N-NLS-1$ + if(k >=3D 0) { + int g =3D text.indexOf("=3D 0 && g < k) { + return text.substring(0, g + 2) + prefix + text.substring(k); + } + g =3D text.indexOf("<"); //$NON-NLS-1$ + if(g >=3D 0 && g < k) { + return text.substring(0, g + 1) + prefix + text.substring(k); + } + } + k =3D text.toLowerCase().indexOf("<" + tagname.toLowerCase()); //$NON-NL= S-1$ + if(k >=3D 0) { + return text.substring(0, k + 1) + prefix + ":" + text.substring(k + 1);= //$NON-NLS-1$ + } + k =3D text.toLowerCase().indexOf("=3D 0) { + return text.substring(0, k + 2) + prefix + ":" + text.substring(k + 2);= //$NON-NLS-1$ + } + return text; + } + + static Properties getPrefixes(String body) { + Properties p =3D new Properties(); + int i =3D 0; + while(i >=3D 0 && i < body.length()) { + i =3D body.indexOf("<%@ taglib ", i); //$NON-NLS-1$ + if(i < 0) break; + int j =3D body.indexOf("%>", i); //$NON-NLS-1$ + if(j < 0) j =3D body.length(); + String taglib =3D body.substring(i, j); + getPrefix(p, taglib); + i =3D j + 1; + } + return p; + } + + static void getPrefix(Properties p, String taglib) { + int i =3D taglib.indexOf("uri=3D\""); //$NON-NLS-1$ + if(i < 0) return; + int j =3D taglib.indexOf("\"", i + 5); //$NON-NLS-1$ + if(j < 0) return; + String uri =3D taglib.substring(i + 5, j); + i =3D taglib.indexOf("prefix=3D\""); //$NON-NLS-1$ + if(i < 0) return; + j =3D taglib.indexOf("\"", i + 8); //$NON-NLS-1$ + if(j < 0) return; + String prefix =3D taglib.substring(i + 8, j); + p.setProperty(uri, prefix); + } + } Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/jspeditor/dnd/PaletteTaglibInserter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteTaglibInserter.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteTaglibInserter.java 2009-09-21 12:32:55 UTC (rev 17678) @@ -0,0 +1,404 @@ +/*************************************************************************= ****** + * 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.jsp.jspeditor.dnd; + +import java.util.HashMap; +import java.util.List; +import java.util.Properties; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManage= r; +import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; +import org.eclipse.wst.xml.core.internal.document.DocumentImpl; +import org.eclipse.wst.xml.core.internal.document.ElementImpl; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.web.tld.TaglibData; +import org.jboss.tools.jst.web.tld.VpeTaglibManager; +import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public class PaletteTaglibInserter { + + private static final String JSP_SOURCE_ROOT_ELEMENT =3D "jsp:root"; //$NO= N-NLS-1$ + public static final String JSP_URI =3D "http://java.sun.com/JSP/Page"; //= $NON-NLS-1$ + public static final String faceletUri =3D "http://java.sun.com/jsf/facele= ts"; //$NON-NLS-1$ + + private static final String TAGLIB_START =3D "<%@ taglib"; //$NON-NLS-1$ + + public Properties inserTaglib(ISourceViewer v, Properties p) { + if(!inserTaglibInXml(v, p)) { + inserTaglibInOldJsp(v, p); + } + return p; + } + + private boolean checkProperties(Properties p) { + return "true".equalsIgnoreCase(p.getProperty(PaletteInsertHelper.PROPOPE= RTY_ADD_TAGLIB)) && //$NON-NLS-1$ + p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI) !=3D null= && + p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).length() = > 0 && + !p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).equals(J= SP_URI) && + p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX) !=3D null= && + p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX).length() = > 0 && + p.getProperty(PaletteInsertHelper.PROPOPERTY_START_TEXT) !=3D null; + } + + public boolean inserTaglibInOldJsp(ISourceViewer v, Properties p) { + if(!checkProperties(p)) { + return false; + } + + IDocument d =3D v.getDocument(); + IStructuredModel model =3D null; + + try { + model =3D StructuredModelManager.getModelManager().getExistingModelForR= ead(d); + IDOMDocument xmlDocument =3D (model instanceof IDOMModel) ? ((IDOMModel= ) model).getDocument() : null; + if (xmlDocument =3D=3D null) { + return false; + } + Properties tl =3D getPrefixes(v); + if(tl =3D=3D null) tl =3D JSPPaletteInsertHelper.getPrefixes(d.get()); + Element root =3D xmlDocument.getDocumentElement(); + + String uri_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRAR= Y_URI); + String defaultPrefix_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY= _DEFAULT_PREFIX); + String lineDelimiter =3D PaletteInsertHelper.getLineDelimiter(d); + StringBuffer tg =3D new StringBuffer(TAGLIB_START).append(" uri=3D\"").= append(uri_p).append("\"").append(" prefix=3D\"").append(defaultPrefix_p).a= ppend("\"%>").append(lineDelimiter); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS= -3$ //$NON-NLS-4$ + + if (tl !=3D null && !tl.isEmpty()) { + //If taglib already exist check the prefix if changed + if (tl.containsKey(uri_p)) { + if (!tl.get(uri_p).equals(defaultPrefix_p)) { + p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String= )tl.get(uri_p)); + } + } else if(!tl.containsValue(defaultPrefix_p)) { + if (checkplace(xmlDocument, d, "jsp:directive.taglib", tg, p, v) =3D= =3D false) { //$NON-NLS-1$ + d.replace(0, 0, tg.toString()); + mouveFocusOnPage(p,v, tg.toString().length(), 0); + return true; + } + } + } else if(xmlDocument instanceof DocumentImpl) { + DocumentImpl docImpl =3D (DocumentImpl)xmlDocument; + // Only for JSP + if(docImpl.isJSPType()) { + if (checkplace(xmlDocument, d, "jsp:directive.page", tg, p, v) =3D=3D= false) { //$NON-NLS-1$ + d.replace(0, 0, tg.toString()); + mouveFocusOnPage(p,v, tg.toString().length(), 0); + return true; + } + } + } + } catch (BadLocationException e) { + ModelUIPlugin.getPluginLog().logError(e); + } finally { + if (model !=3D null) model.releaseFromRead(); + } + return false; + } + = + private static Node getSelectedNode(ISourceViewer v, Properties p){ + ISelectionProvider selProvider =3D (ISelectionProvider)p.get(PaletteInse= rtHelper.PROPOPERTY_SELECTION_PROVIDER); + if(selProvider =3D=3D null) return null; + = + ITextSelection selection =3D null; + = + if(selProvider.getSelection() instanceof ITextSelection) + selection =3D (ITextSelection)selProvider.getSelection(); + else return null; + = + IndexedRegion region =3D ContentAssistUtils.getNodeAt(v, selection.getOf= fset()); + if(region =3D=3D null) return null; + = + if(!(region instanceof Node)) return null; + = + Node text =3D (Node)region; + = + = + if("#text".equals(text.getNodeName())) //$NON-NLS-1$ + return text.getParentNode(); + else + return text; + } + = + private static boolean checkSelectedElement(HashMap map, I= SourceViewer v, Properties p){ + String taglibUri =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIB= RARY_URI); + if(taglibUri =3D=3D null) return false; + = + Node selectedNode =3D getSelectedNode(v, p); + if(selectedNode =3D=3D null) return false; + = + return checkElement(map, selectedNode, taglibUri); + } + = + private static boolean checkElement(HashMap map, Node node= , String taglibUri){ + = + NamedNodeMap attrs =3D node.getAttributes(); + for (int j =3D 0; attrs !=3D null && j < attrs.getLength(); j++) { + Node a =3D attrs.item(j); + String name =3D a.getNodeName(); + + if (name.startsWith("xmlns:")) { //$NON-NLS-1$ + map.put(a.getNodeValue(), name.substring("xmlns:".length())); //$NON-N= LS-1$ + } + } + + if (map.containsKey(taglibUri)) return true; + else{ + if(node.getParentNode() =3D=3D null) return false; + else return checkElement(map, node.getParentNode(), taglibUri); + } + } + + public boolean inserTaglibInXml(ISourceViewer v, Properties p) { + if(!checkProperties(p)) { + return false; + } + = + IDocument d =3D v.getDocument(); + IStructuredModel model =3D null; + = + try { + model =3D StructuredModelManager.getModelManager().getExistingModelForR= ead(d); + IDOMDocument xmlDocument =3D (model instanceof IDOMModel) ? ((IDOMModel= ) model).getDocument() : null; + = + if (xmlDocument =3D=3D null) { + return false; + } + = + Properties tl =3D getPrefixes(v); + if(tl =3D=3D null) tl =3D JSPPaletteInsertHelper.getPrefixes(d.get()); + Element root =3D xmlDocument.getDocumentElement(); + if(root !=3D null) { + // for xhtml and jsp:root = + if (xmlDocument.getDoctype() !=3D null /* && tagLibListConainsFacelet(= tl)*/ ) { + String publicId =3D xmlDocument.getDoctype().getPublicId(); + if (publicId!=3Dnull && publicId.toUpperCase().startsWith("-//W3C//DT= D XHTML")) { // && root.getNodeName().equalsIgnoreCase(HTML_SOURCE_ROOT_ELE= MENT)) { //$NON-NLS-1$ + checkTL(root, v, p, d); + return true; + } + } else if(xmlDocument.isXMLType() || root.getNodeName().equals(JSP_SOU= RCE_ROOT_ELEMENT)) { + checkTL(root, v, p, d); + return true; + } + } + } finally { + if (model !=3D null) model.releaseFromRead(); + } + return false; + } + +// private static boolean tagLibListConainsFacelet(List tagLibList) { +// if (tagLibList !=3D null && !tagLibList.isEmpty()) { +// for (int i =3D 0; i < tagLibList.size(); i++) { +// TaglibData tgld =3D (TaglibData)tagLibList.get(i); +// if(faceletUri.equals(tgld.getUri())) { +// return true; +// } +// } +// } +// return false; +// } + + /* + * analyse source for taglib, return the list of taglib + */ + private static Properties getPrefixes(ISourceViewer viewer) { + VpeTaglibManager tldManager =3D null; + if((tldManager =3D=3D null) && (viewer instanceof VpeTaglibManagerProvid= er)) { + tldManager =3D ((VpeTaglibManagerProvider)viewer).getTaglibManager(); + if(tldManager !=3D null) { + List list =3D tldManager.getTagLibs(); + Properties p =3D new Properties(); + for (int i =3D 0; i < list.size(); i++) { + TaglibData data =3D (TaglibData)list.get(i); + p.setProperty(data.getUri(), data.getPrefix()); + } + return p; + } = + } + return null; + } + + /* + * for jsp:root and html check the taglib if exist check the prefix else = add the taglib + * with text formatting + */ + private static Properties checkTL(Element root, ISourceViewer v, Properti= es p, IDocument d) { + String uri_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY= _URI); + String defaultPrefix_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_= DEFAULT_PREFIX); + + HashMap map =3D new HashMap(); + NamedNodeMap attrs =3D root.getAttributes(); + for (int j =3D 0; attrs !=3D null && j < attrs.getLength(); j++) { + Node a =3D attrs.item(j); + String name =3D a.getNodeName(); + + if (name.startsWith("xmlns:")) { //$NON-NLS-1$ + map.put(a.getNodeValue(), name.substring("xmlns:".length())); //$NON-N= LS-1$ + } + } + = + if (map.containsKey(uri_p) || checkSelectedElement(map, v, p)) { + if (!map.get(uri_p).equals(defaultPrefix_p)) { + p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String) = map.get(uri_p)); + } + } else if(!map.containsValue(defaultPrefix_p)) { + StringBuffer attribute =3D new StringBuffer("xmlns:").append(defaultPre= fix_p).append("=3D\"").append(uri_p).append("\""); //$NON-NLS-1$ //$NON-NL= S-2$ //$NON-NLS-3$ + int so =3D ((IDOMElement)root).getStartOffset(); + int seo =3D ((IDOMElement)root).getStartEndOffset(); + try { + String lineDelimiter =3D PaletteInsertHelper.getLineDelimiter(d); + StringBuffer selectedSource =3D new StringBuffer().append(d.get(so, se= o-so)); + int xmlns =3D selectedSource.indexOf("xmlns"); //$NON-NLS-1$ + attribute =3D new StringBuffer().append(createEmptyCharArray(xmlns)).a= ppend("xmlns:").append(defaultPrefix_p).append("=3D\"").append(uri_p).appen= d("\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if (d.getLineOffset(d.getLineOfOffset(so)) !=3D so) { = + attribute.insert(0, analyseSubstring(d.get(d.getLineOffset(d.getLineO= fOffset(so)), so-d.getLineOffset(d.getLineOfOffset(so))))); + } = + if(xmlns>0) { + attribute.insert(0, lineDelimiter); + } else { + attribute.insert(0, ' '); + } + selectedSource.insert(selectedSource.length()-1, attribute); + d.replace(so, seo-so, selectedSource.toString()); + } catch (BadLocationException t) { + ModelUIPlugin.getPluginLog().logError("", t); //$NON-NLS-1$ + } + } + return p; + } + + private static char[] createEmptyCharArray(int n){ + if(n<1) { + return new char[0]; + } + char[] ca =3D new char[n]; + for (int i =3D 0; i < n; i++) + ca[i]=3D' '; + return ca; + } + + private static void mouveFocusOnPage(Properties p, ISourceViewer v, int l= ength, int pos){ + ISelectionProvider selProvider =3D (ISelectionProvider)p.get(PaletteInse= rtHelper.PROPOPERTY_SELECTION_PROVIDER); + IDocument doc =3D v.getDocument(); + + if (doc=3D=3D null || selProvider =3D=3D null) return; + + ITextSelection selection =3D (ITextSelection)selProvider.getSelection(); + if (selection.getOffset() =3D=3D 0) { = + v.setSelectedRange(length,0); + p.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER,v.getSelection= Provider()); + } + else = + if (selection.getOffset() =3D=3D pos ){ + v.setSelectedRange(length, 0); + p.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER,v.getSelectionP= rovider()); + } + } + + /* + * analyse the space between the left corner and the start offset o the t= ext + */ = + private static StringBuffer analyseSubstring(String str){ + StringBuffer st =3D new StringBuffer().append(str); = + for (int i =3D 0; i < st.length(); i++) { + if (st.charAt(i) !=3D ' ' && st.charAt(i) !=3D'\t' ) { + st.setCharAt(i, ' '); + } + } + return st; = + } + + private static boolean checkplace(IDOMDocument xmlDocument, IDocument d, = String st, StringBuffer tg, Properties p, ISourceViewer v) throws BadLocati= onException { + NodeList nl =3D xmlDocument.getChildNodes(); + boolean docType =3D false; + IndexedRegion irdt =3D null; + + if (xmlDocument.getDoctype() !=3D null) { + docType =3D true; + String publicId =3D xmlDocument.getDoctype().getPublicId(); + if (publicId!=3Dnull && publicId.toUpperCase().startsWith("-//W3C//DTD = HTML")) { //$NON-NLS-1$ + irdt =3D (xmlDocument.getDoctype() instanceof IndexedRegion) ? + (IndexedRegion)xmlDocument.getDoctype(): null; + } + } + + if (nl !=3D null && nl.getLength() !=3D 0) { + for (int i=3D0; i < nl.getLength(); i++) { + Node n =3D nl.item(i); + //fing the first taglib to insert before + if (n.getNodeName().equals(st) && st.equals("jsp:directive.taglib")) {= //$NON-NLS-1$ + //calculate the space between taglib and left page corner + int so =3D ((ElementImpl)n).getStartOffset(); + //taglib is at left corner = + if (d.getLineOffset(d.getLineOfOffset(so)) =3D=3D so) { + d.replace(so, 0, tg.toString()); + } else { + StringBuffer left =3D new StringBuffer(). + append(analyseSubstring(d.get(d.getLineOffset(d.getLineOfOffset(so))= , so-d.getLineOffset(d.getLineOfOffset(so))))); + tg.insert(tg.length(), left); + d.replace(so, 0, tg.toString()); + } + return true; + } + if ((n.getNodeName().equals(st) && st.equals("jsp:directive.page")) ) = { //$NON-NLS-1$ + tg.delete(tg.lastIndexOf(PaletteInsertHelper.getLineDelimiter(d)), tg= .length()); + int so =3D ((ElementImpl)n).getStartOffset(); + int eo =3D ((ElementImpl)n).getEndStartOffset(); + StringBuffer tgleft =3D new StringBuffer().append(PaletteInsertHelper= .getLineDelimiter(d)); + if (d.getLineOffset(d.getLineOfOffset(so)) =3D=3D so) { + tgleft.append(tg); + d.replace(eo, 0, tgleft.toString()); + mouveFocusOnPage(p,v, eo + tgleft.length(), eo); + } else { + tgleft.append(analyseSubstring(d.get(d.getLineOffset(d.getLineOfOffs= et(so)), so-d.getLineOffset(d.getLineOfOffset(so))))); + tgleft.append(tg); + d.replace(eo, 0, tgleft.toString()); + mouveFocusOnPage(p,v, eo + tgleft.length(), eo); + } + return true; + } + if (docType && irdt !=3D null) { + tg.delete(tg.lastIndexOf(PaletteInsertHelper.getLineDelimiter(d)), tg= .length()); + int so =3D irdt.getStartOffset(); + int eo =3D irdt.getEndOffset(); + StringBuffer tgleft =3D new StringBuffer().append(PaletteInsertHelper= .getLineDelimiter(d)); + if (d.getLineOffset(d.getLineOfOffset(so)) =3D=3D so) { + tgleft.append(tg); + d.replace(eo, 0, tgleft.toString()); + mouveFocusOnPage(p,v, eo + tgleft.length(), eo); + } else { + tgleft.append(analyseSubstring(d.get(d.getLineOffset(d.getLineOfOffs= et(so)), so-d.getLineOffset(d.getLineOfOffset(so))))); + tgleft.append(tg); + d.replace(eo, 0, tgleft.toString()); + mouveFocusOnPage(p,v, eo + tgleft.length(), eo); + } + return true; + } + } + } + return false; + } +} \ No newline at end of file --===============3938968021695345626==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 08:41:16 2009 Content-Type: multipart/mixed; boundary="===============4210453918368577345==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17679 - in trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette: src/org/jboss/tools/vpe/ui/palette and 1 other directory. Date: Mon, 21 Sep 2009 08:41:16 -0400 Message-ID: <200909211241.n8LCfGZl009042@svn01.web.mwc.hst.phx2.redhat.com> --===============4210453918368577345== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 08:41:16 -0400 (Mon, 21 Sep 2009) New Revision: 17679 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe= /ui/palette/PaletteDragSourceListener.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Splitting PaletteInsertHelper into jsp and non-jsp related parts. Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFES= T.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2= 009-09-21 12:32:55 UTC (rev 17678) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2= 009-09-21 12:41:16 UTC (rev 17679) @@ -11,6 +11,7 @@ org.eclipse.jface.text, org.eclipse.ui, org.eclipse.gef, - org.jboss.tools.common.model.ui + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.jsp Bundle-Version: 2.1.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/to= ols/vpe/ui/palette/PaletteDragSourceListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vp= e/ui/palette/PaletteDragSourceListener.java 2009-09-21 12:32:55 UTC (rev 17= 678) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vp= e/ui/palette/PaletteDragSourceListener.java 2009-09-21 12:41:16 UTC (rev 17= 679) @@ -23,6 +23,7 @@ import org.jboss.tools.common.model.XModelTransferBuffer; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.vpe.ui.palette.model.PaletteItem; = public class PaletteDragSourceListener extends DragSourceAdapter { @@ -67,7 +68,7 @@ defaultPrefix =3D object.getParent().getAttributeValue("default prefi= x"); //$NON-NLS-1$ } if(defaultPrefix !=3D null && tag !=3D null) { - PaletteInsertHelper.applyPrefix(d, "", tag, "xxx", defaultPrefix); //= $NON-NLS-1$ //$NON-NLS-2$ + JSPPaletteInsertHelper.applyPrefix(d, "", tag, "xxx", defaultPrefix);= //$NON-NLS-1$ //$NON-NLS-2$ } int i =3D d[0].indexOf('|'); if(i >=3D 0) d[0] =3D d[0].substring(0, i) + d[0].substring(i + 1); --===============4210453918368577345==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 09:30:57 2009 Content-Type: multipart/mixed; boundary="===============3411990644063257383==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17680 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: select and 1 other directories. Date: Mon, 21 Sep 2009 09:30:56 -0400 Message-ID: <200909211330.n8LDUugE018535@svn01.web.mwc.hst.phx2.redhat.com> --===============3411990644063257383== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-21 09:30:56 -0400 (Mon, 21 Sep 2009) New Revision: 17680 Added: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/action/ModelContributionManager.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/navigator/ModelNavigatorActionGroup.java Removed: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/action/StrutsContributionManager.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/navigator/StrutsNavigatorActionGroup.java Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/select/SelectObjectWizard.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/navigator/NavigatorViewPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Minor changes to remove 'jsf' and 'struts' names. Copied: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/= tools/common/model/ui/action/ModelContributionManager.java (from rev 16771,= trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/c= ommon/model/ui/action/StrutsContributionManager.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/action/ModelContributionManager.java = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/action/ModelContributionManager.java 2009-09-21 13:30:56 = UTC (rev 17680) @@ -0,0 +1,66 @@ +/*************************************************************************= ****** + * 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.model.ui.action; + +import java.util.*; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.action.*; +import org.eclipse.jface.viewers.*; +import org.eclipse.swt.widgets.*; +import org.eclipse.ui.actions.ActionContext; +import org.jboss.tools.common.model.XModelObject; + +public class ModelContributionManager extends MenuManager { + ActionContext context; + Shell shell; + = + public ModelContributionManager(Shell shell) { + super("JBoss Tools"); + this.shell =3D shell; + } + = + public void setContext(ActionContext context) { + this.context =3D context; + } + = + protected void update(boolean force, boolean recursive) { + if (isDirty() || force) { + if (getMenu() !=3D null && !getMenu().isDisposed()) { + Menu menu =3D getMenu(); + MenuItem[] is =3D menu.getItems(); + for (int i =3D 0; i < is.length; i++) is[i].dispose(); + XModelObject[] os =3D getSelectedModelObjects(); + if(os.length =3D=3D 0) return; + XModelObject o =3D os[0]; + if(os.length =3D=3D 1) os =3D null; + XModelObjectActionList l =3D new XModelObjectActionList(o.getModelEnti= ty().getActionList(), o, os, new Object[]{o}); + l.setShell(shell); + l.createMenu(menu); + l.removeLastSeparator(menu); + } + } + } + = + public XModelObject[] getSelectedModelObjects() { + ISelection s =3D context.getSelection(); + if(s.isEmpty() || !(s instanceof StructuredSelection)) return new XModel= Object[0]; + StructuredSelection ss =3D (StructuredSelection)s; + Iterator it =3D ss.iterator(); + ArrayList l =3D new ArrayList(); + while(it.hasNext()) { + IAdaptable a =3D (IAdaptable)it.next(); + XModelObject o =3D (XModelObject)a.getAdapter(XModelObject.class); + if(o !=3D null) l.add(o); + } + return l.toArray(new XModelObject[0]); = + } + = +} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/action/StrutsContributionManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/action/StrutsContributionManager.java 2009-09-21 12:41:16= UTC (rev 17679) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/action/StrutsContributionManager.java 2009-09-21 13:30:56= UTC (rev 17680) @@ -1,66 +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.model.ui.action; - -import java.util.*; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.action.*; -import org.eclipse.jface.viewers.*; -import org.eclipse.swt.widgets.*; -import org.eclipse.ui.actions.ActionContext; -import org.jboss.tools.common.model.XModelObject; - -public class StrutsContributionManager extends MenuManager { - ActionContext context; - Shell shell; - = - public StrutsContributionManager(Shell shell) { - super("JBoss Tools Struts"); - this.shell =3D shell; - } - = - public void setContext(ActionContext context) { - this.context =3D context; - } - = - protected void update(boolean force, boolean recursive) { - if (isDirty() || force) { - if (getMenu() !=3D null && !getMenu().isDisposed()) { - Menu menu =3D getMenu(); - MenuItem[] is =3D menu.getItems(); - for (int i =3D 0; i < is.length; i++) is[i].dispose(); - XModelObject[] os =3D getSelectedModelObjects(); - if(os.length =3D=3D 0) return; - XModelObject o =3D os[0]; - if(os.length =3D=3D 1) os =3D null; - XModelObjectActionList l =3D new XModelObjectActionList(o.getModelEnti= ty().getActionList(), o, os, new Object[]{o}); - l.setShell(shell); - l.createMenu(menu); - l.removeLastSeparator(menu); - } - } - } - = - public XModelObject[] getSelectedModelObjects() { - ISelection s =3D context.getSelection(); - if(s.isEmpty() || !(s instanceof StructuredSelection)) return new XModel= Object[0]; - StructuredSelection ss =3D (StructuredSelection)s; - Iterator it =3D ss.iterator(); - ArrayList l =3D new ArrayList(); - while(it.hasNext()) { - IAdaptable a =3D (IAdaptable)it.next(); - XModelObject o =3D (XModelObject)a.getAdapter(XModelObject.class); - if(o !=3D null) l.add(o); - } - return l.toArray(new XModelObject[0]); = - } - = -} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/select/SelectObjectWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/select/SelectObjectWizard.java 2009-09-21 12:41:16 UTC (r= ev 17679) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/select/SelectObjectWizard.java 2009-09-21 13:30:56 UTC (r= ev 17680) @@ -88,9 +88,6 @@ = String[] views =3D new String[]{ "org.jboss.tools.jst.web.ui.navigator.WebProjectsView" //$NON-NLS-1$ -// "org.jboss.tools.jsf.ui.navigator.JsfProjectsView", -// "org.jboss.tools.struts.ui.navigator.StrutsProjectsView", -// "org.jboss.tools.common.model.ui.navigator.NavigatorViewPart" }; = private XModelObject selectInNavigator() { Copied: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/= tools/common/model/ui/views/navigator/ModelNavigatorActionGroup.java (from = rev 16771, trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbo= ss/tools/common/model/ui/views/navigator/StrutsNavigatorActionGroup.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/navigator/ModelNavigatorActionGroup.java = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/navigator/ModelNavigatorActionGroup.java 2009-09-21= 13:30:56 UTC (rev 17680) @@ -0,0 +1,169 @@ +/*************************************************************************= ****** + * 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.model.ui.views.navigator; + +import org.jboss.tools.common.model.ui.action.ModelContributionManager; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.action.Separator; +//import org.eclipse.jface.util.IPropertyChangeListener; +//import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.actions.ActionContext; +import org.eclipse.ui.actions.ActionFactory; +import org.eclipse.ui.actions.AddBookmarkAction; +import org.eclipse.ui.actions.AddTaskAction; +import org.eclipse.ui.actions.WorkingSetFilterActionGroup; +import org.eclipse.ui.dialogs.PropertyDialogAction; +import org.eclipse.ui.ide.IDEActionFactory; +import org.eclipse.ui.views.navigator.*; + +public class ModelNavigatorActionGroup extends ResourceNavigatorActionGrou= p { + + protected AddBookmarkAction addBookmarkAction; + protected AddTaskAction addTaskAction; = + protected PropertyDialogAction propertyDialogAction; + protected CollapseAllAction collapseAllAction; + protected ToggleLinkingAction toggleLinkingAction; + = + protected OpenActionGroup openGroup; + protected NRefactorActionGroup refactorGroup; + protected WorkingSetFilterActionGroup workingSetGroup; + protected WorkspaceActionGroup workspaceGroup; + = + protected ModelContributionManager mcm; + protected boolean activateModelContribution =3D false; + + /** + * Constructs the main action group. + */ + public ModelNavigatorActionGroup(IResourceNavigator navigator) { + super(navigator); + makeSubGroups(); + } + + /** + * Makes the actions contained directly in this action group. + */ + protected void makeActions() { + Shell shell =3D navigator.getSite().getShell(); + = + if(activateModelContribution) { + mcm =3D new ModelContributionManager(shell); + } + = + addBookmarkAction =3D new AddBookmarkAction(shell); + addTaskAction =3D new AddTaskAction(shell); = + propertyDialogAction =3D + new PropertyDialogAction(navigator.getSite(), navigator.getViewer()); + = + collapseAllAction =3D new CollapseAllAction(navigator, "Collapse All"); + collapseAllAction.setToolTipText("Collapse All"); + collapseAllAction.setImageDescriptor(getImageDescriptor("elcl16/collapse= all.gif")); //$NON-NLS-1$ + + toggleLinkingAction =3D new ToggleLinkingAction( + navigator, "Link with Editor"); + toggleLinkingAction.setToolTipText("Link with Editor"); + toggleLinkingAction.setImageDescriptor(getImageDescriptor("elcl16/synced= .gif"));//$NON-NLS-1$ + } + = + /** + * Makes the sub action groups. + */ + protected void makeSubGroups() { + openGroup =3D new OpenActionGroup(navigator); + refactorGroup =3D new NRefactorActionGroup(navigator); + workspaceGroup =3D new WorkspaceActionGroup(navigator); + } + = + /** + * Extends the superclass implementation to set the context in the subgro= ups. + */ + public void setContext(ActionContext context) { + super.setContext(context); + openGroup.setContext(context); + refactorGroup.setContext(context); + workspaceGroup.setContext(context); + if(mcm !=3D null) mcm.setContext(context); + } + = + /** + * Adds the actions in this group and its subgroups to the action bars. + */ + public void fillActionBars(IActionBars actionBars) { + actionBars.setGlobalActionHandler( + ActionFactory.PROPERTIES.getId(), + propertyDialogAction); + actionBars.setGlobalActionHandler( + IDEActionFactory.BOOKMARK.getId(), + addBookmarkAction); + actionBars.setGlobalActionHandler( + IDEActionFactory.ADD_TASK.getId(), + addTaskAction); + openGroup.fillActionBars(actionBars); + refactorGroup.fillActionBars(actionBars); + workspaceGroup.fillActionBars(actionBars); + + IToolBarManager toolBar =3D actionBars.getToolBarManager(); + toolBar.add(new Separator()); + toolBar.add(collapseAllAction); = + toolBar.add(toggleLinkingAction); + } + = + /** + * Updates the actions which were added to the action bars, + * delegating to the subgroups as necessary. + */ + public void updateActionBars() { + IStructuredSelection selection =3D + (IStructuredSelection) getContext().getSelection(); + propertyDialogAction.setEnabled(selection.size() =3D=3D 1); + addBookmarkAction.selectionChanged(selection); + addTaskAction.selectionChanged(selection); + = + openGroup.updateActionBars(); + refactorGroup.updateActionBars(); + workspaceGroup.updateActionBars(); + if(mcm !=3D null) mcm.markDirty(); + if(mcm !=3D null) mcm.update(true); + } = + = + /** + * Runs the default action (open file) by delegating the open group. + */ + public void runDefaultAction(IStructuredSelection selection) { + openGroup.runDefaultAction(selection); + } + = + /** + * Handles a key pressed event by invoking the appropriate action, + * delegating to the subgroups as necessary. + */ + public void handleKeyPressed(KeyEvent event) { + refactorGroup.handleKeyPressed(event); + workspaceGroup.handleKeyPressed(event); + } + = + /** + * Extends the superclass implementation to dispose the subgroups. + */ + public void dispose() { + openGroup.dispose(); + refactorGroup.dispose(); + workspaceGroup.dispose(); + if(mcm !=3D null) mcm.dispose(); + super.dispose(); + } + = + = +} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/views/navigator/NavigatorViewPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/navigator/NavigatorViewPart.java 2009-09-21 12:41:1= 6 UTC (rev 17679) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/navigator/NavigatorViewPart.java 2009-09-21 13:30:5= 6 UTC (rev 17680) @@ -104,7 +104,7 @@ private NavigatorStatusLineProvider statusLineProvider =3D new NavigatorS= tatusLineProvider(); private ActivationListener fActivationListener=3D new ActivationListener(= ); = - boolean useStrutsMenu =3D true; + boolean useModelMenu =3D true; = public NavigatorViewPart() { selectionProvider.addSelectionChangedListener(new SL()); @@ -167,8 +167,6 @@ = protected String[] getActionClasses() { String[] actions =3D new String[]{ - "org.jboss.tools.struts.ui.internal.action.CreateProjectAction", //$NON= -NLS-1$ - "org.jboss.tools.struts.ui.internal.action.ImportProjectAction" = //$NON-NLS-1$ }; return actions; } @@ -246,7 +244,7 @@ //@S_CHECK@ TreeViewerMenuInvoker listener =3D createMenuInvoker(); listener.setViewer(viewer); - if(useStrutsMenu) { + if(useModelMenu) { viewer.getTree().addMouseListener(listener); } } @@ -453,7 +451,7 @@ } = protected void makeActions() { - setActionGroup(new StrutsNavigatorActionGroup(this)); + setActionGroup(new ModelNavigatorActionGroup(this)); } = ResourceNavigatorActionGroup actionGroup; @@ -486,7 +484,7 @@ fillContextMenu(manager); } }); - if(!useStrutsMenu) { + if(!useModelMenu) { TreeViewer treeViewer =3D getViewer(); Menu menu =3D menuMgr.createContextMenu(treeViewer.getTree()); treeViewer.getTree().setMenu(menu); @@ -530,11 +528,11 @@ }; = private void saveLinkingEnabled(IMemento _memento) { - _memento.putInteger("LinkStrutsProjectsToEditor", isLinkingEnabled ? 1 := 0); //$NON-NLS-1$ + _memento.putInteger("LinkModelProjectsToEditor", isLinkingEnabled ? 1 : = 0); //$NON-NLS-1$ } = private void restoreLinkingEnabled() { - Integer val =3D memento.getInteger("LinkStrutsProjectsToEditor");//IWork= benchPreferenceConstants.LINK_NAVIGATOR_TO_EDITOR); //$NON-NLS-1$ + Integer val =3D memento.getInteger("LinkModelProjectsToEditor");//IWorkb= enchPreferenceConstants.LINK_NAVIGATOR_TO_EDITOR); //$NON-NLS-1$ if (val !=3D null) { isLinkingEnabled =3D val.intValue() !=3D 0; } Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss= /tools/common/model/ui/views/navigator/StrutsNavigatorActionGroup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/navigator/StrutsNavigatorActionGroup.java 2009-09-2= 1 12:41:16 UTC (rev 17679) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/navigator/StrutsNavigatorActionGroup.java 2009-09-2= 1 13:30:56 UTC (rev 17680) @@ -1,169 +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.model.ui.views.navigator; - -import org.jboss.tools.common.model.ui.action.StrutsContributionManager; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.action.Separator; -//import org.eclipse.jface.util.IPropertyChangeListener; -//import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.actions.ActionContext; -import org.eclipse.ui.actions.ActionFactory; -import org.eclipse.ui.actions.AddBookmarkAction; -import org.eclipse.ui.actions.AddTaskAction; -import org.eclipse.ui.actions.WorkingSetFilterActionGroup; -import org.eclipse.ui.dialogs.PropertyDialogAction; -import org.eclipse.ui.ide.IDEActionFactory; -import org.eclipse.ui.views.navigator.*; - -public class StrutsNavigatorActionGroup extends ResourceNavigatorActionGro= up { - - protected AddBookmarkAction addBookmarkAction; - protected AddTaskAction addTaskAction; = - protected PropertyDialogAction propertyDialogAction; - protected CollapseAllAction collapseAllAction; - protected ToggleLinkingAction toggleLinkingAction; - = - protected OpenActionGroup openGroup; - protected NRefactorActionGroup refactorGroup; - protected WorkingSetFilterActionGroup workingSetGroup; - protected WorkspaceActionGroup workspaceGroup; - = - protected StrutsContributionManager struts; - protected boolean activateStrutsContribution =3D false; - - /** - * Constructs the main action group. - */ - public StrutsNavigatorActionGroup(IResourceNavigator navigator) { - super(navigator); - makeSubGroups(); - } - - /** - * Makes the actions contained directly in this action group. - */ - protected void makeActions() { - Shell shell =3D navigator.getSite().getShell(); - = - if(activateStrutsContribution) { - struts =3D new StrutsContributionManager(shell); - } - = - addBookmarkAction =3D new AddBookmarkAction(shell); - addTaskAction =3D new AddTaskAction(shell); = - propertyDialogAction =3D - new PropertyDialogAction(navigator.getSite(), navigator.getViewer()); - = - collapseAllAction =3D new CollapseAllAction(navigator, "Collapse All"); - collapseAllAction.setToolTipText("Collapse All"); - collapseAllAction.setImageDescriptor(getImageDescriptor("elcl16/collapse= all.gif")); //$NON-NLS-1$ - - toggleLinkingAction =3D new ToggleLinkingAction( - navigator, "Link with Editor"); - toggleLinkingAction.setToolTipText("Link with Editor"); - toggleLinkingAction.setImageDescriptor(getImageDescriptor("elcl16/synced= .gif"));//$NON-NLS-1$ - } - = - /** - * Makes the sub action groups. - */ - protected void makeSubGroups() { - openGroup =3D new OpenActionGroup(navigator); - refactorGroup =3D new NRefactorActionGroup(navigator); - workspaceGroup =3D new WorkspaceActionGroup(navigator); - } - = - /** - * Extends the superclass implementation to set the context in the subgro= ups. - */ - public void setContext(ActionContext context) { - super.setContext(context); - openGroup.setContext(context); - refactorGroup.setContext(context); - workspaceGroup.setContext(context); - if(struts !=3D null) struts.setContext(context); - } - = - /** - * Adds the actions in this group and its subgroups to the action bars. - */ - public void fillActionBars(IActionBars actionBars) { - actionBars.setGlobalActionHandler( - ActionFactory.PROPERTIES.getId(), - propertyDialogAction); - actionBars.setGlobalActionHandler( - IDEActionFactory.BOOKMARK.getId(), - addBookmarkAction); - actionBars.setGlobalActionHandler( - IDEActionFactory.ADD_TASK.getId(), - addTaskAction); - openGroup.fillActionBars(actionBars); - refactorGroup.fillActionBars(actionBars); - workspaceGroup.fillActionBars(actionBars); - - IToolBarManager toolBar =3D actionBars.getToolBarManager(); - toolBar.add(new Separator()); - toolBar.add(collapseAllAction); = - toolBar.add(toggleLinkingAction); - } - = - /** - * Updates the actions which were added to the action bars, - * delegating to the subgroups as necessary. - */ - public void updateActionBars() { - IStructuredSelection selection =3D - (IStructuredSelection) getContext().getSelection(); - propertyDialogAction.setEnabled(selection.size() =3D=3D 1); - addBookmarkAction.selectionChanged(selection); - addTaskAction.selectionChanged(selection); - = - openGroup.updateActionBars(); - refactorGroup.updateActionBars(); - workspaceGroup.updateActionBars(); - if(struts !=3D null) struts.markDirty(); - if(struts !=3D null) struts.update(true); - } = - = - /** - * Runs the default action (open file) by delegating the open group. - */ - public void runDefaultAction(IStructuredSelection selection) { - openGroup.runDefaultAction(selection); - } - = - /** - * Handles a key pressed event by invoking the appropriate action, - * delegating to the subgroups as necessary. - */ - public void handleKeyPressed(KeyEvent event) { - refactorGroup.handleKeyPressed(event); - workspaceGroup.handleKeyPressed(event); - } - = - /** - * Extends the superclass implementation to dispose the subgroups. - */ - public void dispose() { - openGroup.dispose(); - refactorGroup.dispose(); - workspaceGroup.dispose(); - if(struts !=3D null) struts.dispose(); - super.dispose(); - } - = - = -} --===============3411990644063257383==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 13:42:04 2009 Content-Type: multipart/mixed; boundary="===============7645134763259272818==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17681 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console. Date: Mon, 21 Sep 2009 13:42:04 -0400 Message-ID: <200909211742.n8LHg4iu004274@svn01.web.mwc.hst.phx2.redhat.com> --===============7645134763259272818== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-21 13:42:04 -0400 (Mon, 21 Sep 2009) New Revision: 17681 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml Log: Fix description to look alike with other hibernate wizards. 'Create a ...' = instead of 'Creates a ..' Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin= .xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2= 009-09-21 13:30:56 UTC (rev 17680) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2= 009-09-21 17:42:04 UTC (rev 17681) @@ -83,7 +83,7 @@ id=3D"org.hibernate.eclipse.console.wizards.ConsoleConfigurati= onCreationWizard" name=3D"Hibernate Console Configuration" preferredPerspectives=3D"org.hibernate.eclipse.console.Hiberna= teConsolePerspective"> - Creates a new Hibernate Console Configuration + Create a new Hibernate Console Configuration --> - \ No newline at end of file + --===============7645134763259272818==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 13:59:30 2009 Content-Type: multipart/mixed; boundary="===============8113615964096478682==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17682 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui. Date: Mon, 21 Sep 2009 13:59:29 -0400 Message-ID: <200909211759.n8LHxTfJ006918@svn01.web.mwc.hst.phx2.redhat.com> --===============8113615964096478682== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-21 13:59:29 -0400 (Mon, 21 Sep 2009) New Revision: 17682 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.propert= ies trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.xml Log: Description is added for New Hibernate XML Mapping file New Wizard Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.= properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.proper= ties 2009-09-21 17:42:04 UTC (rev 17681) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.proper= ties 2009-09-21 17:59:29 UTC (rev 17682) @@ -6,4 +6,5 @@ JavaEditorMenu_GenerateHibernateAnnotations=3DGenerate &Hibernate/JPA anno= tations... JavaElementMenu_GenerateHibernateAnnotations=3DGenerate &Hibernate/JPA ann= otations Menu_Source=3D&Source -New_wizard_menu_New_mapping_file=3DHibernate XML Mapping file (hbm.xml) \ No newline at end of file +New_wizard_menu_New_mapping_file=3DHibernate XML Mapping file (hbm.xml) +New_wizard_menu_New_mapping_file_description =3D Creates a new Hibernate X= ML Mapping file \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.xml 20= 09-09-21 17:42:04 UTC (rev 17681) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.xml 20= 09-09-21 17:59:29 UTC (rev 17682) @@ -149,6 +149,10 @@ class=3D"org.hibernate.eclipse.jdt.ui.wizards.NewHibernateMapp= ingFileWizard" icon=3D"icons/hibernate_small_icon.gif" id=3D"org.hibernate.eclipse.console.wizards.NewHibernateMappin= gFileWizard" - name=3D"%New_wizard_menu_New_mapping_file"/> + name=3D"%New_wizard_menu_New_mapping_file"> + + %New_wizard_menu_New_mapping_file_description + + --===============8113615964096478682==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 14:24:33 2009 Content-Type: multipart/mixed; boundary="===============0862950087275049360==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17683 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl. Date: Mon, 21 Sep 2009 14:24:33 -0400 Message-ID: <200909211824.n8LIOX8L012479@svn01.web.mwc.hst.phx2.redhat.com> --===============0862950087275049360== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-21 14:24:33 -0400 (Mon, 21 Sep 2009) New Revision: 17683 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/e= clipse/as/core/server/xpl/PublishCopyUtil.java Log: JBIDE-4912 - fixed an NPE Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jbos= s/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/= eclipse/as/core/server/xpl/PublishCopyUtil.java 2009-09-21 17:59:29 UTC (re= v 17682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/= eclipse/as/core/server/xpl/PublishCopyUtil.java 2009-09-21 18:24:33 UTC (re= v 17683) @@ -474,13 +474,15 @@ copyFile(file.getContents(), path, file.getLocalTimeStamp(), mf); else { File file2 =3D (File) mf.getAdapter(File.class); - InputStream in =3D null; - try { - in =3D new FileInputStream(file2); - } catch (IOException e) { - throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_= ID, 0, NLS.bind(Messages.errorReading, file2.getAbsolutePath()), e)); - } - copyFile(in, path, file2.lastModified(), mf); + if( file2 !=3D null ) { + InputStream in =3D null; + try { + in =3D new FileInputStream(file2); + } catch (IOException e) { + throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN= _ID, 0, NLS.bind(Messages.errorReading, file2.getAbsolutePath()), e)); + } + copyFile(in, path, file2.lastModified(), mf); + } // else silently ignore I guess } } = --===============0862950087275049360==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 15:30:28 2009 Content-Type: multipart/mixed; boundary="===============6117708640068289258==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17684 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core: src/org/jboss/ide/eclipse/as/wtp/core/util and 1 other directories. Date: Mon, 21 Sep 2009 15:30:28 -0400 Message-ID: <200909211930.n8LJUSm7023323@svn01.web.mwc.hst.phx2.redhat.com> --===============6117708640068289258== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-21 15:30:27 -0400 (Mon, 21 Sep 2009) New Revision: 17684 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/util/ResourceListVirtualFolder.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/FilesetVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java Log: Adding further implementations for some primary use cases here Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml 2009-09-2= 1 18:24:33 UTC (rev 17683) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml 2009-09-2= 1 19:30:27 UTC (rev 17684) @@ -8,6 +8,10 @@ class=3D"org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFolderRef= erenceResolver" id=3D"org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolderRefere= nceResolver"> + + = Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-09-21 18:24:33 U= TC (rev 17683) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-09-21 19:30:27 U= TC (rev 17684) @@ -2,9 +2,8 @@ = import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.Collection; +import java.util.HashMap; = import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -14,26 +13,69 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile; import org.eclipse.wst.common.componentcore.internal.resources.VirtualFold= er; +import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.componentcore.resources.IVirtualResource; = +// TODO THis class is fucked and incorrectly works. = +// The first instance (top) treats 'resources' as folders to search +// Others try to treat it as items that are inside. This is bad. = public class ResourceListVirtualFolder extends VirtualFolder { = - private ArrayList resources; + private ArrayList children; + private ArrayList underlying; public ResourceListVirtualFolder( IProject aComponentProject, - IPath aRuntimePath, = - IResource[] containers) { + IPath aRuntimePath) { super(aComponentProject, aRuntimePath); - this.resources =3D new ArrayList(); - this.resources.addAll(Arrays.asList(containers)); + this.children =3D new ArrayList(); + this.underlying =3D new ArrayList(); } = - protected void addResource(IResource c) { - //this.resources.add(c); + public ResourceListVirtualFolder( + IProject aComponentProject, + IPath aRuntimePath, IContainer[] underlyingContainers) { + this(aComponentProject, aRuntimePath); + this.underlying.addAll(Arrays.asList(underlyingContainers)); } + + public ResourceListVirtualFolder( + IProject aComponentProject, + IPath aRuntimePath, IContainer[] underlyingContainers, = + IResource[] looseResources) { + this(aComponentProject, aRuntimePath, underlyingContainers); + this.children.addAll(Arrays.asList(looseResources)); + } + + protected void addUnderlyingResource(IResource resource) { + if( underlying instanceof IContainer ) { = + underlying.add((IContainer)resource); + try { + IResource[] newChildren =3D ((IContainer)resource).members(); + for( int i =3D 0; i < newChildren.length; i++ ) { + children.add(newChildren[i]); + } + } catch( CoreException ce) { + // TODO log + } + } + } + + protected void addUnderlyingResource(IResource[] resources) { + for( int i =3D 0; i < resources.length; i++ ) { + addUnderlyingResource(resources[i]); + } + } = + protected void addChild(IResource resource) { + this.children.add(resource); + } + + protected void addChildren(IResource[] resources) { + this.children.addAll(Arrays.asList(resources)); + } + = + = public IResource getUnderlyingResource() { - // Since I'm a container, pretend I'm a container I guess return getUnderlyingFolder(); } = @@ -42,55 +84,45 @@ } = public IContainer getUnderlyingFolder() { = - IResource[] r =3D (IResource[]) resources.toArray(new IResource[resource= s.size()]); - for( int i =3D 0; i < r.length; i++ ) - if( r[i] instanceof IContainer ) - return (IContainer)r[i]; - return null; + return underlying.size() > 0 ? underlying.get(0) : null; } = public IContainer[] getUnderlyingFolders() { - IResource[] r =3D (IResource[]) resources.toArray(new IResource[resource= s.size()]); - ArrayList c =3D new ArrayList(); - for( int i =3D 0; i < r.length; i++ ) - if( r[i] instanceof IContainer ) - c.add((IContainer)r[i]); - return (IContainer[]) c.toArray(new IContainer[c.size()]); + return (IContainer[]) underlying.toArray(new IContainer[underlying.size(= )]); } = + public IVirtualResource[] members(int memberFlags) throws CoreException { - List virtualResources =3D new ArrayList(); // result - Set allNames =3D new HashSet(); - IResource[] containers2 =3D (IResource[]) this.resources.toArray(new IRe= source[this.resources.size()]); - for( int i =3D 0; i < containers2.length; i++ ) { - IResource realResource =3D containers2[i]; - if ((realResource !=3D null) && (realResource.getType() =3D=3D IResourc= e.FOLDER || realResource.getType() =3D=3D IResource.PROJECT)) { - IContainer realContainer =3D (IContainer) realResource; - IResource[] realChildResources =3D realContainer.members(memberFlags); - for (int realResourceIndex =3D 0; realResourceIndex < realChildResourc= es.length; realResourceIndex++) { - IResource child =3D realChildResources[realResourceIndex]; - String localName =3D child.getName(); - if (allNames.add(localName)) { - IPath newRuntimePath =3D getRuntimePath().append(localName); - if (child instanceof IFile) { - virtualResources.add(new VirtualFile(getProject(), newRuntimePath, = (IFile) child)); - } else if( child instanceof IContainer ){ - IContainer childContainer =3D (IContainer)child; - IResource[] members =3D childContainer.members(); - ResourceListVirtualFolder childFolder =3D = - new ResourceListVirtualFolder(getProject(), newRuntimePath, member= s); - virtualResources.add(childFolder); - } - } - } - } else if(realResource !=3D null && realResource instanceof IFile) { - // An IResource.FILE would be an error condition (as this is a contain= er) - virtualResources.add(new VirtualFile(getProject(), = - getRuntimePath().append(((IFile)realResource).getName()), (IFile)rea= lResource)); = - } + HashMap virtualResources =3D new HashMap(); // result + IResource[] resources =3D (IResource[]) this.children.toArray(new IResou= rce[this.children.size()]); + for( int i =3D 0; i < resources.length; i++ ) { + handleResource(resources[i], virtualResources, memberFlags); } - return virtualResources.toArray(new IVirtualResource[virtualResources.si= ze()]); + Collection c =3D virtualResources.values(); + return (IVirtualResource[]) c.toArray(new IVirtualResource[c.size()]); } = - = + protected void handleResource(IResource resource, HashMap map, int memberFlags) throws CoreException { + if( resource instanceof IFile ) { + if( !map.containsKey(resource.getName()) ) { + IVirtualFile virtFile =3D new VirtualFile(getProject(), = + getRuntimePath().append(((IFile)resource).getName()), (IFile)resourc= e); + map.put(resource.getName(), virtFile); + return; + } = + }// end file + else if( resource instanceof IContainer ) { + IContainer realContainer =3D (IContainer) resource; + IResource[] realChildResources =3D realContainer.members(memberFlags); + IVirtualResource previousValue =3D map.get(resource.getName()); + if( previousValue !=3D null && previousValue instanceof ResourceListVir= tualFolder ) { + ((ResourceListVirtualFolder)previousValue).addUnderlyingResource(realC= ontainer); + } else if( previousValue =3D=3D null ) { + ResourceListVirtualFolder childFolder =3D = + new ResourceListVirtualFolder(getProject(), getRuntimePath().append(r= esource.getName())); + childFolder.addUnderlyingResource(realContainer); + map.put(resource.getName(), childFolder); + } + } // end container + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java 2009-09= -21 18:24:33 UTC (rev 17683) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java 2009-09= -21 19:30:27 UTC (rev 17684) @@ -24,10 +24,14 @@ return ExportedClassFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; } = - protected IResource[] getExposableResources() { + protected IResource[] getLooseResources() { + return new IResource[]{}; + } + = + protected IContainer[] getUnderlyingContainers() { IJavaProject jp =3D JavaCore.create(project); IClasspathEntry[] entries =3D findAllClassFolderEntries(jp); - ArrayList results =3D new ArrayList(); + ArrayList results =3D new ArrayList(); for( int i =3D 0; i < entries.length; i++ ) { IClasspathAttribute attribute =3D ClasspathDependencyUtil.checkForCompo= nentDependencyAttribute( entries[i], @@ -36,11 +40,11 @@ if( attribute !=3D null ) { final IResource resource =3D ResourcesPlugin.getWorkspace().getRoot().= findMember(entries[i].getPath()); if (resource !=3D null && resource instanceof IContainer ) { - results.add(resource); + results.add((IContainer)resource); } } } - return (IResource[]) results.toArray(new IResource[results.size()]); + return results.toArray(new IContainer[results.size()]); } = protected IClasspathEntry[] findAllClassFolderEntries(IJavaProject javaPr= oject) { @@ -55,5 +59,4 @@ } = return list.toArray(new IClasspathEntry[list.size()]); } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-09-21 18:24:33 UTC = (rev 17683) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-09-21 19:30:27 UTC = (rev 17684) @@ -2,6 +2,7 @@ = import java.util.Properties; = +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -47,7 +48,6 @@ String firstSegment =3D getFirstIdSegment(); if (project.equals(referencingComp.getProject())) return firstSegment; = - = return firstSegment + Path.SEPARATOR + project.getName(); } = @@ -63,12 +63,15 @@ } = public IVirtualFolder getRootFolder() { - IResource[] resources =3D getExposableResources(); - return new ResourceListVirtualFolder( - project, new Path("/"), resources); + IContainer[] containers =3D getUnderlyingContainers(); + IResource[] looseResources =3D getLooseResources(); + ResourceListVirtualFolder folder =3D = + new ResourceListVirtualFolder(project, new Path("/"), containers, loose= Resources); + return folder; } = - protected abstract IResource[] getExposableResources(); + protected abstract IContainer[] getUnderlyingContainers(); + protected abstract IResource[] getLooseResources(); = public Properties getMetaProperties() { return null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-21 18:24:3= 3 UTC (rev 17683) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-21 19:30:2= 7 UTC (rev 17684) @@ -23,7 +23,11 @@ return OutputFolderReferenceResolver.OUTPUT_FOLDER_PROTOCOL; } = - protected IResource[] getExposableResources() { + protected IResource[] getLooseResources() { + return new IResource[]{}; + } + + protected IContainer[] getUnderlyingContainers() { List result =3D new ArrayList(); try { if (!project.hasNature(JavaCore.NATURE_ID)) --===============6117708640068289258==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 17:23:30 2009 Content-Type: multipart/mixed; boundary="===============4448006071246636040==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17685 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: wizards and 1 other directory. Date: Mon, 21 Sep 2009 17:23:30 -0400 Message-ID: <200909212123.n8LLNURm008222@svn01.web.mwc.hst.phx2.redhat.com> --===============4448006071246636040== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-21 17:23:29 -0400 (Mon, 21 Sep 2009) New Revision: 17685 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclip= se/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclip= se/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclip= se/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-4874 - changed the messaging. seems there's no way to tell if we're e= diting or not Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/id= e/eclipse/as/ui/Messages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/Messages.java 2009-09-21 19:30:27 UTC (rev 17684) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/Messages.java 2009-09-21 21:23:29 UTC (rev 17685) @@ -51,8 +51,7 @@ public static String JBossRuntimeWizardFragment_OutputFolderExists; public static String rwf_CopyConfigLabel; public static String rwf_DestinationLabel; - public static String rwf_TitleCreate; - public static String rwf_TitleEdit; + public static String rwf_JBossRuntime; public static String rwf_Explanation; public static String rwf_NameInUse; public static String rwf_homeMissingFiles; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/id= e/eclipse/as/ui/Messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/Messages.properties 2009-09-21 19:30:27 UTC (rev 17684) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/Messages.properties 2009-09-21 21:23:29 UTC (rev 17685) @@ -10,8 +10,7 @@ wf_ConfigLabel=3DConfiguration rwf_CopyConfigLabel=3DCopy configuration "{0}" to a new destination from "= {1}". rwf_DestinationLabel=3DDestination -rwf_TitleCreate=3DCreate a new JBoss Runtime -rwf_TitleEdit=3DEdit a JBoss Runtime +rwf_JBossRuntime=3DJBoss Runtime rwf_Explanation=3DA JBoss Server runtime references a JBoss installation d= irectory.\nIt can be used to set up classpaths for projects which depend on= this runtime,\nas well as by a "server" which will be able to start and st= op instances of JBoss. rwf_NameInUse=3DRuntime name already in use rwf_homeMissingFiles=3DThe home directory does not exist or is missing the= run.jar. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/id= e/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-09-21 19:30:27 UTC (= rev 17684) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-09-21 21:23:29 UTC (= rev 17685) @@ -141,8 +141,7 @@ IRuntime r =3D (IRuntime) getTaskModel() .getObject(TaskModel.TASK_RUNTIME); String version =3D r.getRuntimeType().getVersion(); - handle.setTitle( getRuntime() =3D=3D null ? = - Messages.rwf_TitleCreate : Messages.rwf_TitleEdit); + handle.setTitle( Messages.rwf_JBossRuntime); String description =3D NLS.bind( isEAP() ? Messages.JBEAP_version : Messages.JBAS_version, version); --===============4448006071246636040==-- From jbosstools-commits at lists.jboss.org Mon Sep 21 23:25:29 2009 Content-Type: multipart/mixed; boundary="===============0593738162944413221==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17686 - in trunk/esb/plugins: org.jboss.tools.esb.project.core/.settings and 5 other directories. Date: Mon, 21 Sep 2009 23:25:29 -0400 Message-ID: <200909220325.n8M3PTvc023680@svn01.web.mwc.hst.phx2.redhat.com> --===============0593738162944413221== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dennyxu Date: 2009-09-21 23:25:29 -0400 (Mon, 21 Sep 2009) New Revision: 17686 Added: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/component/ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/component/ESBVirtualComponent.java Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.eclipse= .jdt.core.prefs trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/facet/IJBossESBFacetDataModelProperties.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/facet/JBossESBFacetInstallationDelegate.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/module/JBossESBModuleDelegate.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/module/JBossESBModuleFactory.java trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb= /project/ui/wizards/pages/ESBFacetInstallationPage.java Log: JBIDE-4320: apply the patch --ESB Projects does not respect WTP module depe= ndency rules JBIDE-4767: Add Support for JBoss ESB v4.6 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.= eclipse.jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.eclips= e.jdt.core.prefs 2009-09-21 21:23:29 UTC (rev 17685) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/.settings/org.eclips= e.jdt.core.prefs 2009-09-22 03:25:29 UTC (rev 17686) @@ -1,5 +1,6 @@ -#Wed Aug 27 16:17:18 CST 2008 +#Thu Sep 10 17:06:26 CST 2009 eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 org.eclipse.jdt.core.compiler.compliance=3D1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-09-2= 1 21:23:29 UTC (rev 17685) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-09-2= 2 03:25:29 UTC (rev 17686) @@ -81,6 +81,24 @@ + + + + + + + + + + + + + version=3D"4.2,4.3,4.4,4.5,4.6"> + version=3D"4.2,5.0,5.1"> + version=3D"4.2,4.3,4.4,4.5,4.6"> + version=3D"4.3,5.0"> @@ -163,7 +181,7 @@ projects=3D"true"> + versions=3D"4.2,4.3,4.4,4.5,4.6"> @@ -209,4 +227,14 @@ containerID=3D"org.jboss.esb.runtime.classpath"> + = + = + + + + + = Added: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/too= ls/esb/core/component/ESBVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/component/ESBVirtualComponent.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/component/ESBVirtualComponent.java 2009-09-22 03:25:29 UTC (rev 17= 686) @@ -0,0 +1,7 @@ +package org.jboss.tools.esb.core.component; + +import org.jboss.ide.eclipse.as.wtp.core.vcf.JBTVirtualComponent; + +public class ESBVirtualComponent extends JBTVirtualComponent { + +} Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/= tools/esb/core/facet/IJBossESBFacetDataModelProperties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-09-21 21:23:29 U= TC (rev 17685) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-09-22 03:25:29 U= TC (rev 17686) @@ -27,6 +27,7 @@ = public static final QualifiedName QNAME_ESB_CONTENT_FOLDER =3D new Qualif= iedName("jboss", ESB_CONTENT_FOLDER); public static final QualifiedName QNAME_ESB_SRC_FOLDER =3D new QualifiedN= ame("jboss", ESB_SOURCE_FOLDER); + public static final String ESB_PROJECT_VERSION =3D "jboss.esb.project.pro= ject.version"; = = = Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/= tools/esb/core/facet/JBossESBFacetInstallationDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-21 21:23:29 U= TC (rev 17685) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-22 03:25:29 U= TC (rev 17686) @@ -11,7 +11,6 @@ package org.jboss.tools.esb.core.facet; = import java.io.ByteArrayInputStream; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; = import org.eclipse.core.resources.IFile; @@ -19,11 +18,14 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; @@ -35,6 +37,8 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.jboss.tools.esb.core.ESBProjectCorePlugin; +import org.osgi.service.prefs.BackingStoreException; = public class JBossESBFacetInstallationDelegate implements IDelegate { = @@ -126,6 +130,19 @@ private void createProjectStructure(IProject project) throws CoreExceptio= n{ String strContentFolder =3D model.getStringProperty(IJBossESBFacetDataMo= delProperties.ESB_CONTENT_FOLDER); project.setPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ES= B_CONTENT_FOLDER, strContentFolder); + = + String qualifier =3D ESBProjectCorePlugin.getDefault().getDescriptor().g= etUniqueIdentifier(); + IScopeContext context =3D new ProjectScope(project); + IEclipsePreferences node =3D context.getNode(qualifier); + if (node !=3D null) + node.putDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 2= .0); + = + try { + node.flush(); + } catch (BackingStoreException e) { + e.printStackTrace(); + } + IFolder esbContent =3D project.getFolder(strContentFolder); if(!esbContent.exists()) { esbContent.create(true, true, null); = Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/= tools/esb/core/module/JBossESBModuleDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/module/JBossESBModuleDelegate.java 2009-09-21 21:23:29 UTC (rev 17= 685) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/module/JBossESBModuleDelegate.java 2009-09-22 03:25:29 UTC (rev 17= 686) @@ -14,41 +14,51 @@ import java.util.List; = import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.model.IModuleResource; -import org.eclipse.wst.server.core.util.ModuleFile; -import org.eclipse.wst.server.core.util.ModuleFolder; -import org.eclipse.wst.server.core.util.ProjectModule; +import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; +import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate; +import org.jboss.tools.esb.core.ESBProjectCorePlugin; import org.jboss.tools.esb.core.StatusUtils; +import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties; = -public class JBossESBModuleDelegate extends ProjectModule { +public class JBossESBModuleDelegate extends JBTProjectModuleDelegate imple= ments IJBTModule { = public JBossESBModuleDelegate(IProject project){ super(project); } - @Override - public IModule[] getChildModules() { - return null; - } = public IModuleResource[] members() throws CoreException { + IProject p =3D getProject(); + String qualifier =3D ESBProjectCorePlugin.getDefault().getDescriptor().g= etUniqueIdentifier(); + IScopeContext context =3D new ProjectScope(p); + IEclipsePreferences node =3D context.getNode(qualifier); + if (node !=3D null) { + double d =3D node.getDouble(IJBossESBFacetDataModelProperties.ESB_PROJE= CT_VERSION, 1.0); + if( d < 2.0 ) = + return super.members(); + } + return legacyMembers(); + } + = + public IModuleResource[] legacyMembers() throws CoreException { IProject project =3D getProject(); final IVirtualComponent c =3D ComponentCore.createComponent(project); IVirtualFolder vf =3D c.getRootFolder(); IContainer[] folders =3D vf.getUnderlyingFolders(); + if(folders =3D=3D null || folders.length =3D=3D 0){ throw new CoreException(StatusUtils.errorStatus("The project is not a v= alid JBoss ESB project.")); } @@ -57,8 +67,8 @@ //in the JBT CR1, the length of folders will be 1. IContainer contentFolder =3D folders.length > 1? folders[1] : folders[0]; = - IFolder configFolder =3D project.getFolder(contentFolder.getProjectRelat= ivePath()); - IJavaProject javaPrj =3D JavaCore.create(project); + IFolder configFolder =3D getProject().getFolder(contentFolder.getProject= RelativePath()); + IJavaProject javaPrj =3D JavaCore.create(getProject()); IPath output =3D javaPrj.getOutputLocation(); = // if the jboss-esb.xml file is not in META-INF folder, try to get it fr= om other folder of the project // block this logic as Max's suggestion @@ -67,7 +77,7 @@ List mrs =3D new ArrayList(); = IModuleResource[] esbContent =3D getModuleResources(Path.EMPTY, configFo= lder); - IModuleResource[] classes =3D getModuleResources(Path.EMPTY, project.get= Workspace().getRoot().getFolder(output)); + IModuleResource[] classes =3D getModuleResources(Path.EMPTY, getProject(= ).getWorkspace().getRoot().getFolder(output)); IModuleResource[] allResource =3D new IModuleResource[esbContent.length = + classes.length + mrs.size()]; System.arraycopy(esbContent, 0, allResource, 0, esbContent.length); System.arraycopy(classes, 0, allResource, esbContent.length, classes.len= gth); @@ -77,40 +87,9 @@ } return allResource; } - = - = - = - @Override - public IStatus validate() { - return null; - } = @Override - protected IModuleResource[] getModuleResources(IPath path, IContainer con= tainer) throws CoreException { - = - IResource[] resources =3D container.members(); - if (resources !=3D null) { - int size =3D resources.length; - List list =3D new ArrayList(size); - for (int i =3D 0; i < size; i++) { - IResource resource =3D resources[i]; - if (resource !=3D null && resource.exists()) { - String name =3D resource.getName(); - if (resource instanceof IContainer) { - IContainer container2 =3D (IContainer) resource; - ModuleFolder mf =3D new ModuleFolder(container2, name, path); - mf.setMembers(getModuleResources(path.append(name), container2)); - list.add(mf); - } else if (resource instanceof IFile) { - list.add(new ModuleFile((IFile) resource, name, path)); - } - } - } - IModuleResource[] moduleResources =3D new IModuleResource[list.size()]; - list.toArray(moduleResources); - return moduleResources; - } - return new IModuleResource[0]; + protected String getFactoryId() { + return JBossESBModuleFactory.FACTORY_ID; } - = } Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/= tools/esb/core/module/JBossESBModuleFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/module/JBossESBModuleFactory.java 2009-09-21 21:23:29 UTC (rev 176= 85) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/module/JBossESBModuleFactory.java 2009-09-22 03:25:29 UTC (rev 176= 86) @@ -10,92 +10,29 @@ *************************************************************************= *****/ package org.jboss.tools.esb.core.module; = -import java.util.HashMap; - import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.internal.ModuleFactory; -import org.eclipse.wst.server.core.internal.ServerPlugin; -import org.eclipse.wst.server.core.model.ModuleDelegate; -import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate; +import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate; +import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleFactory; import org.jboss.tools.esb.core.ESBProjectConstant; -import org.jboss.tools.esb.core.ESBProjectCorePlugin; import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties; = -public class JBossESBModuleFactory extends ProjectModuleFactoryDelegate { +public class JBossESBModuleFactory extends JBTProjectModuleFactory { public static final String FACTORY_ID =3D "org.jboss.tools.esb.project.co= re.moduleFactory"; public static final String MODULE_TYPE =3D IJBossESBFacetDataModelPropert= ies.JBOSS_ESB_FACET_ID; - public static final String MODULE_ID_PREFIX =3D IJBossESBFacetDataModelPr= operties.JBOSS_ESB_FACET_ID + "."; - private static ModuleFactory factory; private static JBossESBModuleFactory factDelegate; = public static JBossESBModuleFactory getFactory() { - if (factDelegate =3D=3D null) { - ModuleFactory[] factories =3D ServerPlugin.getModuleFactories(); - for (int i =3D 0; i < factories.length; i++) { - if (factories[i].getId().equals(FACTORY_ID)) { - Object o =3D factories[i] - .getDelegate(new NullProgressMonitor()); - if (o instanceof JBossESBModuleFactory) { - factory =3D factories[i]; - factDelegate =3D (JBossESBModuleFactory) o; - return factDelegate; - } - } - } - } + if (factDelegate =3D=3D null) + factDelegate =3D (JBossESBModuleFactory)getFactory(FACTORY_ID); return factDelegate; } = - = - private HashMap moduleToDelegate; public JBossESBModuleFactory() { - moduleToDelegate =3D new HashMap(); + super(MODULE_TYPE, ESBProjectConstant.ESB_PROJECT_FACET); } = - @Override - protected void clearCache(IProject project) { - super.clearCache(project); - moduleToDelegate.remove(project); + protected JBTProjectModuleDelegate createDelegate(IProject project) { + return new JBossESBModuleDelegate(project); } - = - @Override - public ModuleDelegate getModuleDelegate(IModule module) { - return moduleToDelegate.get(module); - } = - protected IModule[] createModules(IProject project) { - IFacetedProject facetProject; - try { - facetProject =3D ProjectFacetsManager.create(project); - if (facetProject =3D=3D null) { - return null; - } - IProjectFacet esbFacet =3D ProjectFacetsManager - .getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET); - - if (facetProject.hasProjectFacet(esbFacet)) { - IProjectFacetVersion version =3D facetProject.getProjectFacetVersion(e= sbFacet); - IModule module =3D createModule( - MODULE_ID_PREFIX + project.getName(), = - project.getName(), = - MODULE_TYPE, = - version.getVersionString(), = - project); - moduleToDelegate.put(module, new JBossESBModuleDelegate(project)); - return new IModule[] { module }; - } - } catch (CoreException e) { - ESBProjectCorePlugin.getDefault().getLog().log(e.getStatus()); - } - return null; - - } - } Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/to= ols/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/es= b/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-09-21 21:23:2= 9 UTC (rev 17685) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/es= b/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-09-22 03:25:2= 9 UTC (rev 17686) @@ -644,7 +644,14 @@ protected void initializeConfigVersionCombo(Combo cmVersions, String curr= entName, String version) { cmVersions.removeAll(); cmVersions.add("1.0.1"); //$NON-NLS-1$ - if(version !=3D null && version.equals("4.5")) { //$NON-NLS-1$ + double versionNumber =3D 0.0; + try{ + versionNumber =3D Double.valueOf(version); + } + catch(NumberFormatException ex){ + versionNumber =3D 0.0; + } + if(versionNumber >=3D 4.5) { //$NON-NLS-1$ cmVersions.add("1.1.0"); //$NON-NLS-1$ } int index =3D cmVersions.getItemCount() - 1; --===============0593738162944413221==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 02:11:35 2009 Content-Type: multipart/mixed; boundary="===============6751435714883978940==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17687 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet. Date: Tue, 22 Sep 2009 02:11:35 -0400 Message-ID: <200909220611.n8M6BZrN023863@svn01.web.mwc.hst.phx2.redhat.com> --===============6751435714883978940== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dennyxu Date: 2009-09-22 02:11:35 -0400 (Tue, 22 Sep 2009) New Revision: 17687 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/facet/JBossESBFacetInstallationDelegate.java Log: JBIDE-4654: apply the patch JBossESBFacetInstallationDelegate adds incorrect mapping Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/= tools/esb/core/facet/JBossESBFacetInstallationDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-22 03:25:29 U= TC (rev 17686) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-22 06:11:35 U= TC (rev 17687) @@ -29,6 +29,7 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin; import org.eclipse.jst.common.project.facet.WtpUtils; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -49,12 +50,11 @@ public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException { model =3D (IDataModel) config; + final IJavaProject jproj =3D JavaCore.create(project); = createProjectStructure(project); - = - = - final IJavaProject jproj =3D JavaCore.create(project); = + = // Add WTP natures. WtpUtils.addNatures(project); = @@ -66,31 +66,26 @@ } catch (Exception e) { c =3D ComponentCore.createComponent(project); } - = - = + + String outputLoc =3D jproj.readOutputLocation().removeFirstSegments(1).t= oString(); c.create(0, null); - //String esbContent =3D model.getStringProperty(IJBossESBFacetDataModelP= roperties.ESB_CONTENT_FOLDER); - c.setMetaProperty("java-output-path", "/build/classes/"); + c.setMetaProperty("java-output-path", outputLoc); = final IVirtualFolder jbiRoot =3D c.getRootFolder(); = - // Create directory structure - /*String srcFolder =3D null; - srcFolder =3D model - .getStringProperty(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER= ); - jbiRoot.createLink(new Path("/" + srcFolder), 0, null);*/ - String resourcesFolder =3D model - .getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDE= R); + // Map the esbcontent to root for deploy + String resourcesFolder =3D model.getStringProperty( + IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER); jbiRoot.createLink(new Path("/" + resourcesFolder), 0, null); = = - final IVirtualFolder jsrc =3D c.getRootFolder().getFolder("/esbcontent")= ; //$NON-NLS-1$ - final IClasspathEntry[] cp =3D jproj.getRawClasspath(); - for (int i =3D 0; i < cp.length; i++) { - final IClasspathEntry cpe =3D cp[i]; + final IVirtualFolder jsrc =3D c.getRootFolder().getFolder("/"); //$NON-N= LS-1$ + final IClasspathEntry[] cp2 =3D jproj.getRawClasspath(); + for (int i =3D 0; i < cp2.length; i++) { + final IClasspathEntry cpe =3D cp2[i]; if (cpe.getEntryKind() =3D=3D IClasspathEntry.CPE_SOURCE) { if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 ) - jsrc.createLink(cpe.getPath().removeFirstSegments(1), 0, null); + jsrc.createLink(new Path(outputLoc), 0, null); } } = @@ -106,11 +101,6 @@ = ClasspathHelper.removeClasspathEntries(project, fv); ClasspathHelper.addClasspathEntries(project, fv); - = - //String prjName =3D model.getStringProperty(IFacetDataModelProperties.F= ACET_PROJECT_NAME); - //IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProje= ct(prjName); - = - } = private IFile createJBossESBXML(IFolder folder) throws CoreException{ --===============6751435714883978940==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 04:10:46 2009 Content-Type: multipart/mixed; boundary="===============5835802091648754622==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17688 - in trunk/bpel/plugins: org.jboss.tools.bpel.cheatsheet and 15 other directories. Date: Tue, 22 Sep 2009 04:10:46 -0400 Message-ID: <200909220810.n8M8AkXP015093@svn01.web.mwc.hst.phx2.redhat.com> --===============5835802091648754622== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2009-09-22 04:10:46 -0400 (Tue, 22 Sep 2009) New Revision: 17688 Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.eclipse= .jdt.core.prefs trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/b= pel/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/b= pel/cheatsheet/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/tools/b= pel/cheatsheet/Activator.class trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/b= pel/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/b= pel/cheatsheet/ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/b= pel/cheatsheet/Activator.java Log: add cheatsheet for bpel Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath = (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.classpath 2009-09-2= 2 08:10:46 UTC (rev 17688) @@ -0,0 +1,7 @@ + + + + + + + Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project = (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.project 2009-09-22 = 08:10:46 UTC (rev 17688) @@ -0,0 +1,28 @@ + + + org.jboss.tools.bpel.cheatsheet + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.ecl= ipse.jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.eclips= e.jdt.core.prefs (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/.settings/org.eclips= e.jdt.core.prefs 2009-09-22 08:10:46 UTC (rev 17688) @@ -0,0 +1,8 @@ +#Thu Sep 17 15:54:11 CST 2009 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF= (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF= 2009-09-22 08:10:46 UTC (rev 17688) @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Cheatsheet +Bundle-SymbolicName: org.jboss.tools.bpel.cheatsheet;singleton:=3Dtrue +Bundle-Version: 1.0.0 +Bundle-Activator: org.jboss.tools.bpel.cheatsheet.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.ui.cheatsheets +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin/org/jboss/too= ls/bpel/cheatsheet/Activator.class =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/bin= /org/jboss/tools/bpel/cheatsheet/Activator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties = (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties 200= 9-09-22 08:10:46 UTC (rev 17688) @@ -0,0 +1,4 @@ +source.. =3D src/ +output.. =3D bin/ +bin.includes =3D META-INF/,\ + . Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml= (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/bpel.xml= 2009-09-22 08:10:46 UTC (rev 17688) @@ -0,0 +1,89 @@ + = + + + + + Learn how to use JBoss BPEL editor. + + + + + + If you want to deploy a bpel staff into JBoss BPEL server, the first= step, you need create a BPEL project. +Of course, if you only need to draw a BPEL process, you don't need to= do the step. + + + + + + + = + + + After create a BPEL project, you can create a BPEL process file in th= e project. = + + + + + + + + + + + + For getting a useful BPEL process, you need to edit the BPEL proces= s file by adding some BPEL elements. +From the "Palette" view, you can add a BPEL element to the BPEL = process by dragging and dropping it. +From the "Properties" view, you can edit the attributes of a BPE= L element. +From the "Tray of the BPEL editor", you can add a Partner link, = Variable, Correlation Set or Message Exchange to the BPEL process. +If the "Properties" view and "Palette" view are not op= ened, you can open the views by right-clicking the BPEL editor and selectin= g "Show in Properties", "Show Palette in Palette view". + = + = + + = + + + For getting a runnable BPEL staff, beside the BPEL process file, you = need a WSDL to describe how to use the BPEL process. As default, the system= has genereted a WSDL for the BPEL staff. You need to edit it to support yo= ur BPEL project. +Open the WSDL using the WSDL editor, add "Service" and "Bin= ding" by right-clicking on the WSDL editor, and set the attributes of = them in the "Properties" view. + + + = + + + If you want to deploy a BPEL project to JBoss BPEL Runtime, you n= eed to create a bpel-deploy.xml file. + + + + + + = + = + + + Suppose you have installed the JBoss BPEL Runtime-RiftSaw into a = JBoss server, you can create a server in JBoss Tools for JBoss BPEL runtime. + = + + + + + + + + + + + = + = + + + If you don't add a BPEL resource into the server in the thir= d step of "Create a JBoss BPEL Server", you can right-click on th= e server item in the "JBoss Server" view and select the "Add= and Removes...", then you can do the step as the third step of "= Create a JBoss BPEL Server". + +After these steps, you can start the server to test your BPEL staff. + + = + Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml = (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml 2009-09-2= 2 08:10:46 UTC (rev 17688) @@ -0,0 +1,21 @@ + + + + + + + + + Learn how to use JBoss BPEL editor + + + + + \ No newline at end of file Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/too= ls/bpel/cheatsheet/Activator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/= bpel/cheatsheet/Activator.java (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/src/org/jboss/tools/= bpel/cheatsheet/Activator.java 2009-09-22 08:10:46 UTC (rev 17688) @@ -0,0 +1,50 @@ +package org.jboss.tools.bpel.cheatsheet; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID =3D "org.jboss.tools.bpel.cheatsheet= "; + + // The shared instance + private static Activator plugin; + = + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.B= undleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin =3D this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.Bu= ndleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin =3D null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} --===============5835802091648754622==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 04:12:08 2009 Content-Type: multipart/mixed; boundary="===============8448913082480505404==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17689 - trunk/bpel/features/org.jboss.tools.bpel.feature. Date: Tue, 22 Sep 2009 04:12:08 -0400 Message-ID: <200909220812.n8M8C828015308@svn01.web.mwc.hst.phx2.redhat.com> --===============8448913082480505404== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2009-09-22 04:12:08 -0400 (Tue, 22 Sep 2009) New Revision: 17689 Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml Log: change the feature.xml for adding bpel cheatsheet plugin Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2009-09-22= 08:10:46 UTC (rev 17688) +++ trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2009-09-22= 08:12:08 UTC (rev 17689) @@ -1,100 +1,107 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --===============8448913082480505404==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 06:30:59 2009 Content-Type: multipart/mixed; boundary="===============6449609463195986538==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17690 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process: wizard and 1 other directory. Date: Tue, 22 Sep 2009 06:30:59 -0400 Message-ID: <200909221030.n8MAUxVm007850@svn01.web.mwc.hst.phx2.redhat.com> --===============6449609463195986538== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2009-09-22 06:30:58 -0400 (Tue, 22 Sep 2009) New Revision: 17690 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibern= ate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibern= ate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibern= ate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibern= ate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactoring.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibern= ate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-4901 - fixed - the solution was to= use TextFileChange instead of DocumentChange Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org= /hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-09-= 22 08:12:08 UTC (rev 17689) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-09-= 22 10:30:58 UTC (rev 17690) @@ -26,8 +26,8 @@ import org.eclipse.jdt.core.dom.rewrite.ASTRewrite; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; import org.eclipse.text.edits.MalformedTreeException; -import org.eclipse.text.edits.UndoEdit; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.jdt.ui.Activator; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo; @@ -150,8 +150,8 @@ setJavaProject(project); // get the buffer manager ITextFileBufferManager bufferManager =3D FileBuffers.getTextFileBufferMa= nager(); - Iterator> it =3D entities.entrySet().itera= tor(); - /*String outText =3D ""; //$NON-NLS-1$ + /*Iterator> it =3D entities.entrySet().ite= rator(); + String outText =3D ""; //$NON-NLS-1$ String ls =3D System.getProperties().getProperty("line.separator", "\n")= ; //$NON-NLS-1$//$NON-NLS-2$ while (it.hasNext()) { Map.Entry entry =3D it.next(); @@ -237,10 +237,10 @@ for (int i =3D 0; i < changes.size(); i++) { ChangeStructure cs =3D changes.get(i); try { - if (cs.textFileBuffer !=3D null && cs.document !=3D null && cs.textEdi= t !=3D null && + if (cs.textFileBuffer !=3D null && cs.textEdit !=3D null && ((cs.change !=3D null && cs.change.isEnabled()) || (cs.change =3D=3D = null))) { - cs.document =3D cs.textFileBuffer.getDocument(); - UndoEdit undo =3D cs.textEdit.apply(cs.document); + IDocument document =3D cs.textFileBuffer.getDocument(); + cs.textEdit.apply(document); // commit changes to underlying file cs.textFileBuffer.commit(null, true); } @@ -288,7 +288,7 @@ bufferManager.connect(cs.path, LocationKind.IFILE, null); cs.textFileBuffer =3D bufferManager.getTextFileBuffer(cs.path, Location= Kind.IFILE); // retrieve the buffer - cs.document =3D cs.textFileBuffer.getDocument(); + cs.icu =3D icu; AST ast =3D cu.getAST(); ASTRewrite rewriter =3D ASTRewrite.create(ast); // ... rewrite @@ -300,8 +300,9 @@ processor.setEntities(entities); processor.setASTRewrite(rewriter); cu.accept(processor); - // - cs.textEdit =3D rewriter.rewriteAST(cs.document, JavaCore.getOptions()); + //// + IDocument documentChange =3D cs.textFileBuffer.getDocument(); + cs.textEdit =3D rewriter.rewriteAST(documentChange, JavaCore.getOptions= ()); // add change to array of changes changes.add(cs); } catch (JavaModelException e) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org= /hibernate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java 2009-09-22 08= :12:08 UTC (rev 17689) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/ChangeStructure.java 2009-09-22 10= :30:58 UTC (rev 17690) @@ -2,7 +2,7 @@ = import org.eclipse.core.filebuffers.ITextFileBuffer; import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.text.IDocument; +import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.text.edits.TextEdit; = @@ -12,7 +12,7 @@ public class ChangeStructure { public String fullyQualifiedName; public IPath path; - public IDocument document; + public ICompilationUnit icu; public TextEdit textEdit; public ITextFileBuffer textFileBuffer; public Change change; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org= /hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java 2009-09-2= 2 08:12:08 UTC (rev 17689) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java 2009-09-2= 2 10:30:58 UTC (rev 17690) @@ -41,6 +41,7 @@ * * @author Vitali */ +(a)SuppressWarnings("restriction") public class EntitiesList extends UserInputWizardPage { = protected IHibernateJPAWizardData data; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org= /hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactori= ng.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactoring.jav= a 2009-09-22 08:12:08 UTC (rev 17689) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPARefactoring.jav= a 2009-09-22 10:30:58 UTC (rev 17690) @@ -12,13 +12,14 @@ = import java.util.ArrayList; = +import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.CompositeChange; -import org.eclipse.ltk.core.refactoring.DocumentChange; import org.eclipse.ltk.core.refactoring.Refactoring; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.TextFileChange; import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages; import org.hibernate.eclipse.jdt.ui.internal.jpa.process.ChangeStructure; = @@ -55,7 +56,8 @@ for (int i =3D 0; i < changes.size(); i++) { ChangeStructure cs =3D changes.get(i); String change_name =3D cs.fullyQualifiedName; - DocumentChange change =3D new DocumentChange(change_name, cs.document); + TextFileChange change =3D new TextFileChange(change_name, (IFile)cs.icu= .getResource()); + change.setSaveMode(TextFileChange.FORCE_SAVE); change.setEdit(cs.textEdit); cs.change =3D change; cc.add(change); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org= /hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java 200= 9-09-22 08:12:08 UTC (rev 17689) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hiber= nate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java 200= 9-09-22 10:30:58 UTC (rev 17690) @@ -12,9 +12,9 @@ = import org.eclipse.jdt.ui.refactoring.RefactoringSaveHelper; import org.eclipse.jdt.internal.ui.refactoring.actions.RefactoringStarter; -import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages; @@ -24,6 +24,7 @@ * * @author Vitali */ +(a)SuppressWarnings("restriction") public class HibernateJPAWizard extends RefactoringWizard { = protected final String wizard_title =3D JdtUiMessages.AllEntitiesProcesso= r_header; @@ -55,10 +56,11 @@ } = public boolean showWizard() { - IWorkbenchWindow win =3D PlatformUI.getWorkbench().getActiveWorkbenchWin= dow(); - RefactoringStarter refactoringStarter =3D new RefactoringStarter(); - boolean res =3D refactoringStarter.activate(this, win.getShell(), wizard= _title, RefactoringSaveHelper.SAVE_ALL); - RefactoringStatus rs =3D refactoringStarter.getInitialConditionCheckingS= tatus(); + final IWorkbenchWindow win =3D PlatformUI.getWorkbench().getActiveWorkbe= nchWindow(); + final Shell shell =3D win.getShell(); + final RefactoringStarter refactoringStarter =3D new RefactoringStarter(); + boolean res =3D refactoringStarter.activate(this, shell, wizard_title, R= efactoringSaveHelper.SAVE_ALL); + //RefactoringStatus rs =3D refactoringStarter.getInitialConditionCheckin= gStatus(); return res; } = --===============6449609463195986538==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 08:11:24 2009 Content-Type: multipart/mixed; boundary="===============1817853733666950312==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17691 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs. Date: Tue, 22 Sep 2009 08:11:24 -0400 Message-ID: <200909221211.n8MCBODD028739@svn01.web.mwc.hst.phx2.redhat.com> --===============1817853733666950312== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-22 08:11:24 -0400 (Tue, 22 Sep 2009) New Revision: 17691 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4932 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic= .xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2= 009-09-22 10:30:58 UTC (rev 17690) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2= 009-09-22 12:11:24 UTC (rev 17691) @@ -204,8 +204,7 @@ - - + --===============1817853733666950312==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 14:48:31 2009 Content-Type: multipart/mixed; boundary="===============8463837499781827785==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17692 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model. Date: Tue, 22 Sep 2009 14:48:31 -0400 Message-ID: <200909221848.n8MImV9Q008310@svn01.web.mwc.hst.phx2.redhat.com> --===============8463837499781827785== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-22 14:48:31 -0400 (Tue, 22 Sep 2009) New Revision: 17692 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFM= essageELCompletionEngine.java Log: JBIDE-4933: Content Assist doesn't shows proposals for JSF Resource Bundles issue is fixed Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/mod= el/JSFMessageELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= MessageELCompletionEngine.java 2009-09-22 12:11:24 UTC (rev 17691) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF= MessageELCompletionEngine.java 2009-09-22 18:48:31 UTC (rev 17692) @@ -178,6 +178,10 @@ returnEqualedVariablesOnly); if (resolvedVars !=3D null && !resolvedVars.isEmpty()) { resolvedVariables =3D resolvedVars; + ELSegmentImpl segment =3D new ELSegmentImpl(); + segment.setToken(left.getFirstToken()); + segment.setResolved(true); + resolution.addSegment(segment); resolution.setLastResolvedToken(left); break; } @@ -209,6 +213,7 @@ } } resolution.setProposals(proposals); + segment.setResolved(!proposals.isEmpty()); return resolution; } = @@ -227,11 +232,13 @@ if(operand.getLength()<=3DvarName.length()) { TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(varName.substring(operand.getLength())); + proposal.setLabel(varName); setImage(proposal); proposals.add(proposal); } else if(returnEqualedVariablesOnly) { TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(varName); + proposal.setLabel(varName); setImage(proposal); proposals.add(proposal); } @@ -247,8 +254,9 @@ left =3D (ELInvocationExpression)left.getParent(); if (left !=3D expr) { // inside expression ELSegmentImpl segment =3D new ELSegmentImpl(); - segment.setResolved(false); + segment.setResolved(true); resolution.addSegment(segment); + resolution.setLastResolvedToken(left); return resolution; } else { // Last segment resolveLastSegment((ELInvocationExpression)operand, resolvedVariables,= resolution, returnEqualedVariablesOnly); @@ -332,7 +340,7 @@ if (proposal.equals(filter)) { TextProposal kbProposal =3D new TextProposal(); kbProposal.setReplacementString(proposal); - + kbProposal.setLabel(proposal); setImage(kbProposal); = kbProposals.add(kbProposal); @@ -343,6 +351,7 @@ // This is used for CA. TextProposal kbProposal =3D new TextProposal(); kbProposal.setReplacementString(proposal.substring(filter.length())); + kbProposal.setLabel(proposal); kbProposal.setImage(getELProposalImage()); = kbProposals.add(kbProposal); @@ -383,7 +392,7 @@ if (proposal.equals(filter)) { TextProposal kbProposal =3D new TextProposal(); kbProposal.setReplacementString(proposal); - + kbProposal.setLabel(proposal); setImage(kbProposal); = kbProposals.add(kbProposal); @@ -400,6 +409,7 @@ } = kbProposal.setReplacementString(replacementString); + kbProposal.setLabel(proposal); kbProposal.setImage(getELProposalImage()); = kbProposals.add(kbProposal); @@ -424,12 +434,14 @@ if (key.indexOf('.') !=3D -1) { TextProposal proposal =3D new TextProposal(); proposal.setReplacementString("['" + key + "']"); //$NON-NLS-1$ //$NON= -NLS-2$ + proposal.setLabel("['" + key + "']"); setImage(proposal); = kbProposals.add(proposal); } else { TextProposal proposal =3D new TextProposal(); proposal.setReplacementString(key); + proposal.setLabel(key); setImage(proposal); = kbProposals.add(proposal); --===============8463837499781827785==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 15:01:27 2009 Content-Type: multipart/mixed; boundary="===============5006749632332420474==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17693 - branches/jbosstools-3.0.x/documentation/guides/JBDS2.0-2.1-migration. Date: Tue, 22 Sep 2009 15:01:27 -0400 Message-ID: <200909221901.n8MJ1REE011902@svn01.web.mwc.hst.phx2.redhat.com> --===============5006749632332420474== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2009-09-22 15:01:26 -0400 (Tue, 22 Sep 2009) New Revision: 17693 Added: branches/jbosstools-3.0.x/documentation/guides/JBDS2.0-2.1-migration/JBD= S2.0-2.1-migration-guide.doc Log: Doc format for PM peeps Added: branches/jbosstools-3.0.x/documentation/guides/JBDS2.0-2.1-migration= /JBDS2.0-2.1-migration-guide.doc =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/jbosstools-3.0.x/documentation/guides/JBDS2.0= -2.1-migration/JBDS2.0-2.1-migration-guide.doc ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============5006749632332420474==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 15:47:33 2009 Content-Type: multipart/mixed; boundary="===============4109391949835827345==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17694 - trunk/as/plugins/org.jboss.ide.eclipse.as.core. Date: Tue, 22 Sep 2009 15:47:33 -0400 Message-ID: <200909221947.n8MJlX76020487@svn01.web.mwc.hst.phx2.redhat.com> --===============4109391949835827345== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-22 15:47:32 -0400 (Tue, 22 Sep 2009) New Revision: 17694 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: JBIDE-4767 committing to trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-09-22 19= :01:26 UTC (rev 17693) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-09-22 19= :47:32 UTC (rev 17694) @@ -236,7 +236,7 @@ versions=3D"1.0"/> + versions=3D"4.2,4.3,4.4,4.5,4.6,5.0"> + versions=3D"4.2,4.3,4.4,4.5,4,6,5.0"> + versions=3D"4.2,4.3,4.4,4.5,4.6,5.0"> + versions=3D"4.2,4.3,4.4,4.5,4.6,5.0"> = @@ -379,7 +379,7 @@ versions=3D"1.0"/> + versions=3D"4.2,4.3,4.4,4.5,4.6,5.0"> + versions=3D"4.2,4.3,4.4,4.5,4.6,5.0"> --===============1668964746608988510== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-22 16:14:27 -0400 (Tue, 22 Sep 2009) New Revision: 17695 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/module/JBossESBModuleDelegate.java Log: JBIDE-4320 - if and else needed to be swapped Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/= tools/esb/core/module/JBossESBModuleDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/module/JBossESBModuleDelegate.java 2009-09-22 19:47:32 UTC (rev 17= 694) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/module/JBossESBModuleDelegate.java 2009-09-22 20:14:27 UTC (rev 17= 695) @@ -48,9 +48,9 @@ if (node !=3D null) { double d =3D node.getDouble(IJBossESBFacetDataModelProperties.ESB_PROJE= CT_VERSION, 1.0); if( d < 2.0 ) = - return super.members(); + return legacyMembers(); } - return legacyMembers(); + return super.members(); } = public IModuleResource[] legacyMembers() throws CoreException { --===============1668964746608988510==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 17:03:07 2009 Content-Type: multipart/mixed; boundary="===============4522671232580313126==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17696 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core: util and 1 other directories. Date: Tue, 22 Sep 2009 17:03:07 -0400 Message-ID: <200909222103.n8ML37wx032536@svn01.web.mwc.hst.phx2.redhat.com> --===============4522671232580313126== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-22 17:03:06 -0400 (Tue, 22 Sep 2009) New Revision: 17696 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/modules/JBTProjectModuleFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/util/ResourceListVirtualFolder.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/FilesetVirtualComponent.java Log: Ongoing slight cleanup when testing all the pieces that should go into a ne= w project structure. Fixes include incorrect variable used in FilesetVirtua= lComponent, module factory superclass requires to state files that mandate = a re-cache, etc Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/modules/JBTProjectModuleFactory.java 2009-09-22 20:14:27 = UTC (rev 17695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/modules/JBTProjectModuleFactory.java 2009-09-22 21:03:06 = UTC (rev 17696) @@ -6,8 +6,11 @@ = import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.internal.StructureEdit; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; import org.eclipse.wst.common.project.facet.core.IFacetedProject; @@ -101,6 +104,13 @@ } } = + protected IPath[] getListenerPaths() { + return new IPath[] { new Path(".project"), // nature + new Path(StructureEdit.MODULE_META_FILE_NAME), // component + new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") //= facets + }; + } + = protected abstract JBTProjectModuleDelegate createDelegate(IProject proje= ct); = Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-09-22 20:14:27 U= TC (rev 17695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-09-22 21:03:06 U= TC (rev 17696) @@ -16,9 +16,6 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.componentcore.resources.IVirtualResource; = -// TODO THis class is fucked and incorrectly works. = -// The first instance (top) treats 'resources' as folders to search -// Others try to treat it as items that are inside. This is bad. = public class ResourceListVirtualFolder extends VirtualFolder { = private ArrayList children; @@ -35,7 +32,7 @@ IProject aComponentProject, IPath aRuntimePath, IContainer[] underlyingContainers) { this(aComponentProject, aRuntimePath); - this.underlying.addAll(Arrays.asList(underlyingContainers)); + addUnderlyingResource(underlyingContainers); } = public ResourceListVirtualFolder( @@ -43,11 +40,11 @@ IPath aRuntimePath, IContainer[] underlyingContainers, = IResource[] looseResources) { this(aComponentProject, aRuntimePath, underlyingContainers); - this.children.addAll(Arrays.asList(looseResources)); + addChildren(looseResources); } = protected void addUnderlyingResource(IResource resource) { - if( underlying instanceof IContainer ) { = + if( resource instanceof IContainer ) { = underlying.add((IContainer)resource); try { IResource[] newChildren =3D ((IContainer)resource).members(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-09-22 20:14:27 UTC = (rev 17695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-09-22 21:03:06 UTC = (rev 17696) @@ -63,6 +63,7 @@ } = public IVirtualFolder getRootFolder() { + // Creates a new instance each time to ensure it's not cached IContainer[] containers =3D getUnderlyingContainers(); IResource[] looseResources =3D getLooseResources(); ResourceListVirtualFolder folder =3D = --===============4522671232580313126==-- From jbosstools-commits at lists.jboss.org Tue Sep 22 17:03:47 2009 Content-Type: multipart/mixed; boundary="===============5600619670245896486==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17697 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage. Date: Tue, 22 Sep 2009 17:03:47 -0400 Message-ID: <200909222103.n8ML3l2k032612@svn01.web.mwc.hst.phx2.redhat.com> --===============5600619670245896486== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2009-09-22 17:03:47 -0400 (Tue, 22 Sep 2009) New Revision: 17697 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclip= se/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java Log: NPE when archive has no archiveName Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/id= e/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09= -22 21:03:06 UTC (rev 17696) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/ecli= pse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-09= -22 21:03:47 UTC (rev 17697) @@ -550,7 +550,8 @@ comp =3D refs[i].getReferencedComponent(); IPath val =3D refs[i].getRuntimePath(); if( refs[i].getDependencyType() !=3D IVirtualReference.DEPENDENCY_TYPE_= CONSUMES) - val =3D val.append(refs[i].getArchiveName()); + if( refs[i].getArchiveName() !=3D null ) + val =3D val.append(refs[i].getArchiveName()); = objectToRuntimePath.put(comp, val.toString()); oldComponentToRuntimePath.put((IVirtualComponent) comp, val.toString()); --===============5600619670245896486==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 03:57:59 2009 Content-Type: multipart/mixed; boundary="===============0594049770238447502==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17698 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet. Date: Wed, 23 Sep 2009 03:57:59 -0400 Message-ID: <200909230757.n8N7vxct002978@svn01.web.mwc.hst.phx2.redhat.com> --===============0594049770238447502== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dennyxu Date: 2009-09-23 03:57:59 -0400 (Wed, 23 Sep 2009) New Revision: 17698 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/e= sb/core/facet/JBossESBFacetInstallationDelegate.java Log: JBIDE-4807:resource mapping about java project output location doesn't upda= te once the output locatoin is changed apply the patch Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/= tools/esb/core/facet/JBossESBFacetInstallationDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-22 21:03:47 U= TC (rev 17697) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/= esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-09-23 07:57:59 U= TC (rev 17698) @@ -11,8 +11,11 @@ package org.jboss.tools.esb.core.facet; = import java.io.ByteArrayInputStream; -import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; = +import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -22,6 +25,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -29,16 +33,22 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin; import org.eclipse.jst.common.project.facet.WtpUtils; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateRe= ferenceComponentsDataModelProperties; +import org.eclipse.wst.common.componentcore.internal.operation.CreateRefer= enceComponentsDataModelProvider; +import org.eclipse.wst.common.componentcore.internal.util.IComponentImplFa= ctory; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFoldersVirtualComponent; import org.jboss.tools.esb.core.ESBProjectCorePlugin; +import org.jboss.tools.esb.core.component.ESBVirtualComponent; import org.osgi.service.prefs.BackingStoreException; = public class JBossESBFacetInstallationDelegate implements IDelegate { @@ -58,38 +68,32 @@ // Add WTP natures. WtpUtils.addNatures(project); = - // Setup the flexible project structure. - IVirtualComponent c =3D null; - try { - Method createMethod =3D ComponentCore.class.getMethod("createComponent"= , IProject.class, boolean.class); - c =3D (IVirtualComponent)createMethod.invoke(null, project, false); - } catch (Exception e) { - c =3D ComponentCore.createComponent(project); - } + // Setup the flexible project structure + = + /* = + * This is necessary because at time, the project has NO facets + * So a call to createComponent(etc) returns a default implementation. + * Today, this WTP default implementation does not handle = + * new reference types in an acceptable fashion = + * (Does not use extension point). = + */ + IComponentImplFactory factory =3D new ESBVirtualComponent(); + IVirtualComponent newComponent =3D factory.createComponent(project); = String outputLoc =3D jproj.readOutputLocation().removeFirstSegments(1).t= oString(); - c.create(0, null); - c.setMetaProperty("java-output-path", outputLoc); + newComponent.create(0, null); + newComponent.setMetaProperty("java-output-path", outputLoc); + = + final IVirtualFolder jbiRoot =3D newComponent.getRootFolder(); = - final IVirtualFolder jbiRoot =3D c.getRootFolder(); - // Map the esbcontent to root for deploy String resourcesFolder =3D model.getStringProperty( IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER); jbiRoot.createLink(new Path("/" + resourcesFolder), 0, null); - = - = - final IVirtualFolder jsrc =3D c.getRootFolder().getFolder("/"); //$NON-N= LS-1$ - final IClasspathEntry[] cp2 =3D jproj.getRawClasspath(); - for (int i =3D 0; i < cp2.length; i++) { - final IClasspathEntry cpe =3D cp2[i]; - if (cpe.getEntryKind() =3D=3D IClasspathEntry.CPE_SOURCE) { - if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 ) - jsrc.createLink(new Path(outputLoc), 0, null); - } - } - = + = //addESBNature(project); + IVirtualComponent outputFoldersComponent =3D new OutputFoldersVirtualCom= ponent(project, newComponent); + addReference(outputFoldersComponent, newComponent, "/", null); = = JBossClassPathCommand command =3D new JBossClassPathCommand(project, @@ -103,6 +107,32 @@ ClasspathHelper.addClasspathEntries(project, fv); } = + private void addReference(IVirtualComponent component, IVirtualComponent = rootComponent, String path, String archiveName) { + IDataModelProvider provider =3D new CreateReferenceComponentsDataModelPr= ovider(); + IDataModel dm =3D DataModelFactory.createDataModel(provider); + = + dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMP= ONENT, rootComponent); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMP= ONENT_LIST, Arrays.asList(component)); + = + //[Bug 238264] the uri map needs to be manually set correctly + Map uriMap =3D new HashMap(); + uriMap.put(component, archiveName); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMP= ONENTS_TO_URI_MAP, uriMap); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGE= T_COMPONENTS_DEPLOY_PATH, path); + + IStatus stat =3D dm.validateProperty(ICreateReferenceComponentsDataModel= Properties.TARGET_COMPONENT_LIST); + Throwable t =3D stat.getException(); + if (stat =3D=3D null || stat.isOK()) { + try { + dm.getDefaultOperation().execute(new NullProgressMonitor(), null); + return; + } catch (ExecutionException e) { + t =3D e; + } = + } + // TODO Log exception e + } + = private IFile createJBossESBXML(IFolder folder) throws CoreException{ StringBuffer emptyESB =3D new StringBuffer(); String configVersion =3D model.getStringProperty(IJBossESBFacetDataModel= Properties.ESB_CONFIG_VERSION); @@ -142,6 +172,8 @@ esbContent.getFolder("META-INF").create(true, true, null); createJBossESBXML(esbContent.getFolder("META-INF")); = + = + = project.refreshLocal(IResource.DEPTH_ZERO, null); } = --===============0594049770238447502==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 06:39:43 2009 Content-Type: multipart/mixed; boundary="===============4414841823243794338==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17699 - in trunk/jst/plugins: org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common and 1 other directory. Date: Wed, 23 Sep 2009 06:39:43 -0400 Message-ID: <200909231039.n8NAdhY6002550@svn01.web.mwc.hst.phx2.redhat.com> --===============4414841823243794338== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: sdzmitrovich Date: 2009-09-23 06:39:42 -0400 (Wed, 23 Sep 2009) New Revision: 17699 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleListener.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/CSSStyleRuleContainer.java trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/co= mmon/StyleContainer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/common/CSSModel.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/common/Constants.java Log: https://jira.jboss.org/jira/browse/JBIDE-4677 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/common/CSSStyleListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleListener.java 2009-09-23 07:57:59 UTC (rev 17698) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleListener.java 2009-09-23 10:39:42 UTC (rev 17699) @@ -98,7 +98,7 @@ = ISelection selectionToLiteners =3D null; = - if (newStyle !=3D null) { + if (newStyle !=3D null && newStyle.isValid()) { selectionToLiteners =3D new StructuredSelection(newStyle); } else { selectionToLiteners =3D StructuredSelection.EMPTY; Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/common/CSSStyleRuleContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java 2009-09-23 07:57:59 UTC (rev 17698) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/CSSStyleRuleContainer.java 2009-09-23 10:39:42 UTC (rev 17699) @@ -100,4 +100,11 @@ = } = + @Override + public boolean isValid() { + final String text =3D styleRule.getCssText(); + if ((text !=3D null) && (!text.endsWith(Constants.RIGHT_BRACE))) + return false; + return true; + } } Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/common/StyleContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleContainer.java 2009-09-23 07:57:59 UTC (rev 17698) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/c= ommon/StyleContainer.java 2009-09-23 10:39:42 UTC (rev 17699) @@ -50,4 +50,8 @@ = public abstract void removeNodelListener(INodeAdapter adapter); = + public boolean isValid() { + return true; + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/common/CSSModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/CSSModel.java 2009-09-23 07:57:59 UTC (rev 17698) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/CSSModel.java 2009-09-23 10:39:42 UTC (rev 17699) @@ -52,9 +52,6 @@ */ public class CSSModel implements ICSSDialogModel { = - private static String startBraces =3D "{"; //$NON-NLS-1$ - private static String endBraces =3D "}"; //$NON-NLS-1$ - private IStructuredModel model =3D null; private IFile styleFile =3D null; = @@ -131,7 +128,7 @@ if ((styleSheet !=3D null) && (selector !=3D null) && !selector.equals(Constants.EMPTY)) { CSSStyleRule rule =3D (CSSStyleRule) ((ICSSDocument) styleSheet) - .createCSSRule(selector + startBraces + endBraces); + .createCSSRule(selector + Constants.LEFT_BRACE + Constants.RIGHT_BRAC= E); ((ICSSStyleSheet) styleSheet).appendRule(rule); = for (Map.Entry ruleEntry : getRulesMapping() @@ -312,8 +309,8 @@ if ((rules !=3D null) && (rules.getLength() > 0)) { final CSSRule rule =3D rules.item(rules.getLength() - 1); final String text =3D rule.getCssText(); - if ((text !=3D null) && (!text.endsWith(endBraces))) { - rule.setCssText(text + "\n" + endBraces); //$NON-NLS-1$ + if ((text !=3D null) && (!text.endsWith(Constants.RIGHT_BRACE))) { + rule.setCssText(text + "\n" + Constants.RIGHT_BRACE); //$NON-NLS-1$ } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/common/Constants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/Constants.java 2009-09-23 07:57:59 UTC (rev 17698) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/Constants.java 2009-09-23 10:39:42 UTC (rev 17699) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ = + *************************************************************************= *****/ package org.jboss.tools.jst.jsp.outline.cssdialog.common; = import java.util.Arrays; @@ -26,57 +26,65 @@ */ public class Constants { = - public static final String extSizes[] =3D new String[] { "", "em", "ex= ", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - "px", "in", "cm", "mm", "pt", "pc" }; //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + public static final String extSizes[] =3D new String[] { "", "em", "ex", = //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "px", "in", "cm", "mm", "pt", "pc" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ = - public static final Set elemFolder =3D Collections.unmodifiableSet(new= HashSet(Arrays.asList(new String[] { - "background-image", "list-style-image", "cursor", "cue-after", //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - "cue-before" }))); //$NON-NLS-1$ + public static final Set elemFolder =3D Collections + .unmodifiableSet(new HashSet( + Arrays + .asList(new String[] { + "background-image", "list-style-image", "cursor", "cue-after", //= $NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "cue-before" }))); //$NON-NLS-1$ = - public static final Set extElem =3D Collections.unmodifiableSet(new Ha= shSet(Arrays.asList(new String[] { - "border-bottom-width", "border-left-width", "borer-right-width", //$N= ON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - "border-top-width", "border-width", "bottom", "font-size", //$NON-NLS= -1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - "height", "left", "letter-spacing", "line-height", "margin", //$NON-N= LS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - "margin-bottom", "margin-left", "margin-right", "margin-top", //$NON-= NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - "margin-offset", "margin-bottom", "max-height", "max-width", //$NON-N= LS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - "min-height", "min-width", "outline-width", "padding", //$NON-NLS-1$ = //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - "padding-bottom", "padding-left", "padding-right", "padding-top", //$= NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - "right", "size", "text-indent", "top", "vertical-align", "width", //$= NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-N= LS-6$ - "word-spacing" }))); //$NON-NLS-1$ + public static final Set extElem =3D Collections + .unmodifiableSet(new HashSet( + Arrays + .asList(new String[] { + "border-bottom-width", "border-left-width", "borer-right-width", = //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "border-top-width", "border-width", "bottom", "font-size", //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "height", "left", "letter-spacing", "line-height", "margin", //$N= ON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + "margin-bottom", "margin-left", "margin-right", "margin-top", //$= NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "margin-offset", "margin-bottom", "max-height", "max-width", //$N= ON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "min-height", "min-width", "outline-width", "padding", //$NON-NLS= -1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "padding-bottom", "padding-left", "padding-right", "padding-top",= //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "right", "size", "text-indent", "top", "vertical-align", "width",= //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$N= ON-NLS-6$ + "word-spacing" }))); //$NON-NLS-1$ = - public static final String NONE =3D "none"; //$NON-NLS-1$ + public static final String NONE =3D "none"; //$NON-NLS-1$ = - public static final String IMAGE_COLOR_FILE_LOCATION =3D "images/cssdi= alog/color.gif"; //$NON-NLS-1$ - public static final String IMAGE_FOLDER_FILE_LOCATION =3D "images/cssd= ialog/folder.gif"; //$NON-NLS-1$ - public static final String IMAGE_FONT_FILE_LOCATION =3D "images/cssdia= log/font.gif"; //$NON-NLS-1$ - public static final String IMAGE_COLORLARGE_FILE_LOCATION =3D "images/= cssdialog/color_large.gif"; //$NON-NLS-1$ - public static final String IMAGE_FOLDERLARGE_FILE_LOCATION =3D "images= /cssdialog/folder_large.gif"; //$NON-NLS-1$ - public static final String IMAGE_FONTLARGE_FILE_LOCATION =3D "images/c= ssdialog/font_large.gif"; //$NON-NLS-1$ - public static final String IMAGE_LEFT_FILE_LOCATION =3D "images/cssdia= log/left.gif"; //$NON-NLS-1$ - public static final String IMAGE_RIGHT_FILE_LOCATION =3D "images/cssdi= alog/right.gif"; //$NON-NLS-1$ - public static final String IMAGE_SAMPLE_FILE_LOCATION =3D "images/cssd= ialog/sample.gif"; //$NON-NLS-1$ - = - public static final int FIRST_COLUMN =3D 0; - public static final int SECOND_COLUMN =3D 1; + public static final String IMAGE_COLOR_FILE_LOCATION =3D "images/cssdialo= g/color.gif"; //$NON-NLS-1$ + public static final String IMAGE_FOLDER_FILE_LOCATION =3D "images/cssdial= og/folder.gif"; //$NON-NLS-1$ + public static final String IMAGE_FONT_FILE_LOCATION =3D "images/cssdialog= /font.gif"; //$NON-NLS-1$ + public static final String IMAGE_COLORLARGE_FILE_LOCATION =3D "images/css= dialog/color_large.gif"; //$NON-NLS-1$ + public static final String IMAGE_FOLDERLARGE_FILE_LOCATION =3D "images/cs= sdialog/folder_large.gif"; //$NON-NLS-1$ + public static final String IMAGE_FONTLARGE_FILE_LOCATION =3D "images/cssd= ialog/font_large.gif"; //$NON-NLS-1$ + public static final String IMAGE_LEFT_FILE_LOCATION =3D "images/cssdialog= /left.gif"; //$NON-NLS-1$ + public static final String IMAGE_RIGHT_FILE_LOCATION =3D "images/cssdialo= g/right.gif"; //$NON-NLS-1$ + public static final String IMAGE_SAMPLE_FILE_LOCATION =3D "images/cssdial= og/sample.gif"; //$NON-NLS-1$ = - public static final String EMPTY =3D ""; //$NON-NLS-1$ + public static final int FIRST_COLUMN =3D 0; + public static final int SECOND_COLUMN =3D 1; + + public static final String EMPTY =3D ""; //$NON-NLS-1$ public static final String WHITE_SPACE =3D " "; //$NON-NLS-1$ - public static String COLON =3D ":"; //$NON-NLS-1$ - public static String SEMICOLON =3D ";"; //$NON-NLS-1$ - public static String COMMA =3D ","; //$NON-NLS-1$ - public static String DASH =3D "-"; //$NON-NLS-1$ - public static String SLASH =3D "/"; //$NON-NLS-1$ + public static String COLON =3D ":"; //$NON-NLS-1$ + public static String SEMICOLON =3D ";"; //$NON-NLS-1$ + public static String COMMA =3D ","; //$NON-NLS-1$ + public static String DASH =3D "-"; //$NON-NLS-1$ + public static String SLASH =3D "/"; //$NON-NLS-1$ public static final String START_BRACKET =3D "("; //$NON-NLS-1$ public static final String END_BRACKET =3D ")"; //$NON-NLS-1$ = + public static final String LEFT_BRACE =3D "{"; //$NON-NLS-1$ + public static final String RIGHT_BRACE =3D "}"; //$NON-NLS-1$ = - public static final RGB RGB_BLACK =3D new RGB(0,0,0); - public static final RGB RGB_WHITE =3D new RGB(0xFF, 0xFF, 0xFF); + public static final RGB RGB_BLACK =3D new RGB(0, 0, 0); + public static final RGB RGB_WHITE =3D new RGB(0xFF, 0xFF, 0xFF); = - public static final int DONT_CONTAIN =3D -1; - = - public static String OPEN_SPAN_TAG =3D ""; //$NON-NLS-1$ - public static String OPEN_DIV_TAG =3D ""; //$NON-NLS-1$ + public static final int DONT_CONTAIN =3D -1; + + public static String OPEN_SPAN_TAG =3D ""; //$NON-NLS-1$ + public static String OPEN_DIV_TAG =3D ""; //$NON-NLS-1$ } \ No newline at end of file --===============4414841823243794338==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 07:22:25 2009 Content-Type: multipart/mixed; boundary="===============3367937601229192566==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17700 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: util and 1 other directory. Date: Wed, 23 Sep 2009 07:22:25 -0400 Message-ID: <200909231122.n8NBMPCF010788@svn01.web.mwc.hst.phx2.redhat.com> --===============3367937601229192566== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-23 07:22:25 -0400 (Wed, 23 Sep 2009) New Revision: 17700 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/filesystems/impl/FolderImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/util/EclipseResourceUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-4912 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/filesystems/impl/FolderImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/FolderImpl.java 2009-09-23 10:39:42 UTC (rev 1= 7699) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/FolderImpl.java 2009-09-23 11:22:25 UTC (rev 1= 7700) @@ -62,8 +62,9 @@ protected boolean loaded =3D false; protected IContainer resource =3D null; protected String pathForResource =3D null; - protected Map linked =3D new HashMap(); - protected Map linkedResources =3D new HashMap(); + LinkedResources linked =3D new LinkedResources(); +// protected Map linked =3D new HashMap(); +// protected Map linkedResources =3D new HashMap(); = public FolderImpl() {} = @@ -111,8 +112,8 @@ protected String getAbsolutePath() { FolderImpl parent =3D (FolderImpl)getParent(); String p =3D (parent =3D=3D null) ? null : parent.getAbsolutePath(= ); - if(parent.linked.containsKey(getPathPart())) { - return parent.linked.get(getPathPart()).getAbsolutePath(); + if(parent.linked.containsFile(getPathPart())) { + return parent.linked.getFileByFileName(getPathPart()).getAbsolute= Path(); } return (p =3D=3D null) ? null : p + XModelObjectConstants.SEPARATO= R + name(); } @@ -157,10 +158,12 @@ for (int i =3D 0; i < rs.length; i++) { if(!rs[i].isAccessible()) continue; if(!rs[i].isLinked()) continue; + if(rs[i].getLocation() =3D=3D null) { +// System.out.println("no location at link " + rs[i]); + continue; + } File f =3D rs[i].getLocation().toFile(); - String pp =3D FilePathHelper.toPathPath(f.getName()); - linked.put(pp, f); - linkedResources.put(pp, rs[i]); + linked.registerResource(rs[i]); _loadChild(peer, f); } = @@ -187,8 +190,8 @@ p.setProperty(XModelObjectConstants.ATTR_NAME, f.getName()); XModelObject c =3D getModel().createModelObject("FileFolder", = p); //$NON-NLS-1$ String pp =3D FilePathHelper.toPathPath(f.getName()); - if(linked.containsKey(pp)) { - c.setObject("file", linked.get(pp)); //$NON-NLS-1$ + if(linked.containsFile(pp)) { + c.setObject("file", linked.getFileByFileName(pp)); //$NON-NLS= -1$ } addChild(c); } else { @@ -246,7 +249,7 @@ c.set(XModelObjectConstants.ATTR_NAME__FILE, f.getAbsolute= Path()); } } - if(linked.containsValue(f)) { + if(linked.filesByFileName.containsValue(f)) { c.setObject("file", f); //$NON-NLS-1$ } addChild(c); @@ -259,7 +262,7 @@ if(updateLock > 0) return true; updateLock++; Map mf =3D new HashMap(); - linked.clear(); + linked.clearFiles(); XModelObject fileSystem =3D getFileSystem(); if(fileSystem =3D=3D null) return false; FileSystemsImpl fsi =3D (FileSystemsImpl)fileSystem.getParent(); @@ -302,8 +305,7 @@ File f =3D rs[i].getLocation().toFile(); String p =3D FilePathHelper.toPathPath(f.getName()); mf.put(p, f); - linked.put(p, f); - linkedResources.put(p, rs[i]); + linked.registerResource(rs[i]); } } = } @@ -371,8 +373,8 @@ protected File getChildIOFile(XModelObject o) { String s =3D FileAnyImpl.toFileName(o); File f =3D (File)o.getObject("file"); //for links //$NON-NLS-1$ - if(f =3D=3D null && linked.containsKey(o.getPathPart())) { - f =3D linked.get(o.getPathPart()); + if(f =3D=3D null && linked.containsFile(o.getPathPart())) { + f =3D linked.getFileByFileName(o.getPathPart()); } if(f =3D=3D null) { f =3D new File(getFile(), s); @@ -383,8 +385,8 @@ protected File getChildIOFile(String filename) { File f =3D null; String p =3D FilePathHelper.toPathPath(filename); - if(linked.containsKey(p)) { - f =3D linked.get(p); + if(linked.containsFile(p)) { + f =3D linked.getFileByFileName(p); } if(f =3D=3D null) { f =3D new File(getFile(), filename); @@ -615,8 +617,8 @@ p.setProperty(XModelObjectConstants.ATTR_NAME, f.getName()); c =3D getModel().createModelObject("FileFolder", p); //$NON-NL= S-1$ String pp =3D FilePathHelper.toPathPath(f.getName()); - if(linked.containsKey(pp)) { - c.setObject("file", linked.get(pp)); //$NON-NLS-1$ + if(linked.containsFile(pp)) { + c.setObject("file", linked.getFileByFileName(pp)); //$NON-NLS= -1$ } } else { Properties ep =3D getEntityProperties(f); @@ -724,7 +726,7 @@ if (q || loaded) return q; if(getParent() instanceof FolderImpl) { FolderImpl p =3D (FolderImpl)getParent(); - if(p.linked.containsKey(getPathPart())) return true; + if(p.linked.containsFile(getPathPart())) return true; } File[] fs =3D getFiles(); q =3D (fs !=3D null && fs.length > 0); @@ -764,7 +766,7 @@ if(cs[i] instanceof FolderLoader) { b &=3D ((FolderLoader)cs[i]).save(); } else { - File d =3D linked.get(cs[i].getPathPart()); + File d =3D linked.getFileByFileName(cs[i].getPathPart()); if(d =3D=3D null) { d =3D new File(f, FileAnyImpl.toFileName(cs[i])); } @@ -809,7 +811,7 @@ updateLock++; boolean b =3D false; try { - File d =3D linked.get(c.getPathPart()); + File d =3D linked.getFileByFileName(c.getPathPart()); if(d =3D=3D null) { d =3D new File(folder, FileAnyImpl.toFileName(c)); } @@ -923,6 +925,10 @@ } = public XModelObject getChildByPathPart(String pathpart) { + if(linked.filesByLinkName.containsKey(pathpart)) { + File f =3D linked.getFileByResourceName(pathpart); + pathpart =3D f.getName(); + } pathpart =3D FilePathHelper.toPathPath(pathpart); return super.getChildByPathPart(pathpart); } @@ -972,8 +978,8 @@ } = public IContainer getChildContainer(String name) { - if(linked.containsKey(name)) { - IResource r =3D linkedResources.get(name); + if(linked.containsFile(name)) { + IResource r =3D linked.getResourceByFileName(name); return r instanceof IContainer ? (IContainer)r : null; } IContainer c =3D getResource(); @@ -981,8 +987,8 @@ } = public IFile getChildFile(String name) { - if(linked.containsKey(name)) { - IResource r =3D linkedResources.get(name); + if(linked.containsFile(name)) { + IResource r =3D linked.getResourceByFileName(name); return r instanceof IFile ? (IFile)r : null; } IContainer c =3D getResource(); @@ -1061,6 +1067,48 @@ = } = +class LinkedResources { + protected Map filesByLinkName =3D new HashMap= (); + protected Map filesByFileName =3D new HashMap= (); + protected Map resourcesByLinkName =3D new HashMap(); + protected Map resourcesByFileName =3D new HashMap(); + + public boolean containsFile(String name) { + if(filesByFileName.containsKey(name)) return true; + return false; + } + + public File getFileByResourceName(String name) { + return filesByLinkName.get(name); + } + + public File getFileByFileName(String name) { + return filesByFileName.get(name); + } + + public IResource getResourceByResourceName(String name) { + return resourcesByLinkName.get(name); + } + + public IResource getResourceByFileName(String name) { + return resourcesByFileName.get(name); + } + + public void registerResource(IResource r) { + File f =3D r.getLocation().toFile(); + String pp =3D FilePathHelper.toPathPath(f.getName()); + filesByFileName.put(pp, f); + filesByLinkName.put(r.getName(), f); + resourcesByFileName.put(pp, r); + resourcesByLinkName.put(r.getName(), r); + } + + public void clearFiles() { + filesByFileName.clear(); + filesByLinkName.clear(); + } +} + class EclipseFileBodySource implements BodySource { IFile ef =3D null; File f; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/util/EclipseResourceUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/EclipseResourceUtil.java 2009-09-23 10:39:42 UTC (rev 1769= 9) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/EclipseResourceUtil.java 2009-09-23 11:22:25 UTC (rev 1770= 0) @@ -374,6 +374,14 @@ } if(cs !=3D null) for (int i =3D 0; i < cs.length; i++) { if(!cs[i].isLinked()) continue; + if(!cs[i].isAccessible()) continue; + if(cs[i].getLocation() =3D=3D null) { +// System.out.println("no location at link " + cs[i]); + continue; + } + if(cs[i].getLocation().toFile() =3D=3D null || !cs[i].getLocation= ().toFile().isDirectory()) { + continue; + } properties =3D new Properties(); fsLoc =3D cs[i].getLocation().toString(); properties.setProperty(XModelObjectConstants.ATTR_NAME_LOCATION, fsLoc); @@ -418,9 +426,9 @@ } IResource sr =3D s.getResource(); if(sr =3D=3D null) return null; - if(!sr.getLocation().isPrefixOf(resource.getLocation())) return null; - String path =3D resource.getLocation().toString(); - String rootpath =3D sr.getLocation().toString(); + if(!sr.getFullPath().isPrefixOf(resource.getFullPath())) return null; + String path =3D resource.getFullPath().toString(); + String rootpath =3D sr.getFullPath().toString(); String relpath =3D path.substring(rootpath.length()).replace('\\', '/'); if(relpath.length() =3D=3D 0) return s; = @@ -434,7 +442,7 @@ while(p !=3D null && !XModelObjectConstants.TRUE.equals(p.get("overlappe= d"))) p =3D p.getParent(); //$NON-NLS-1$ if(p =3D=3D null) { IResource r =3D (IResource)o.getAdapter(IResource.class); - if(r =3D=3D null || !resource.getLocation().equals(r.getLocation())) { + if(r =3D=3D null || !resource.getFullPath().equals(r.getFullPath())) { //failure, more detailed file system is needed. return null; } --===============3367937601229192566==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 08:58:08 2009 Content-Type: multipart/mixed; boundary="===============3630198926635987761==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17701 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions. Date: Wed, 23 Sep 2009 08:58:08 -0400 Message-ID: <200909231258.n8NCw8Rj025498@svn01.web.mwc.hst.phx2.redhat.com> --===============3630198926635987761== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2009-09-23 08:58:07 -0400 (Wed, 23 Sep 2009) New Revision: 17701 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/actions/OpenMappingAction.java Log: https://jira.jboss.org/jira/browse/JBIDE-4891 - fixed -> activate the prope= r page Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/actions/OpenMappingAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/actions/OpenMappingAction.java 2009-09-23 11:22:25 UT= C (rev 17700) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/actions/OpenMappingAction.java 2009-09-23 12:58:07 UT= C (rev 17701) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2007-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, @@ -27,6 +27,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.actions.SelectionListenerAction; +import org.eclipse.ui.part.MultiPageEditorPart; import org.eclipse.ui.texteditor.ITextEditor; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsoleMessages; @@ -220,6 +221,9 @@ IJavaProject proj =3D ProjectUtils.findJavaProject(editorPart); IRegion selectRegion =3D OpenMappingUtils.findSelectRegion(proj, findAda= pter, selection); if (selectRegion !=3D null) { + if (editorPart instanceof MultiPageEditorPart) { + ((MultiPageEditorPart)editorPart).setActiveEditor(textEditor); + } textEditor.selectAndReveal(selectRegion.getOffset(), selectRegion.getLe= ngth()); return true; } @@ -277,6 +281,9 @@ int length =3D compositeProperty.getNodeName().length(); int offset =3D propRegion.getOffset() + propRegion.getLength() - length = - 1; propRegion =3D new Region(offset, length); + if (editorPart instanceof MultiPageEditorPart) { + ((MultiPageEditorPart)editorPart).setActiveEditor(textEditor); + } textEditor.selectAndReveal(propRegion.getOffset(), propRegion.getLength(= )); return true; } --===============3630198926635987761==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 11:06:28 2009 Content-Type: multipart/mixed; boundary="===============3197259210514323777==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17702 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences and 1 other directories. Date: Wed, 23 Sep 2009 11:06:27 -0400 Message-ID: <200909231506.n8NF6R4K016926@svn01.web.mwc.hst.phx2.redhat.com> --===============3197259210514323777== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2009-09-23 11:06:27 -0400 (Wed, 23 Sep 2009) New Revision: 17702 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/pr= eferences/VpePreferencesInitializer.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/pr= eferences/IVpePreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl= /CustomSashForm.java Log: https://jira.jboss.org/jira/browse/JBIDE-4935, default values for VPE Prefe= rence Page are initialized now. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-23 12:58:0= 7 UTC (rev 17701) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-23 15:06:2= 7 UTC (rev 17702) @@ -550,5 +550,10 @@ = + + + + = = Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/preferences/IVpePreferencesPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/IVpePreferencesPage.java 2009-09-23 12:58:07 UTC (rev 17701) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/IVpePreferencesPage.java 2009-09-23 15:06:27 UTC (rev 17702) @@ -31,4 +31,5 @@ static final String SPLITTING_HORIZ_LEFT_SOURCE_VALUE =3D "3"; //$NON-NLS= -1$ static final String SPLITTING_HORIZ_LEFT_VISUAL_VALUE =3D "4"; //$NON-NLS= -1$ = + static final int DEFAULT_VISUAL_SOURCE_EDITORS_WEIGHTS =3D 500; } Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/js= p/preferences/VpePreferencesInitializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/VpePreferencesInitializer.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/p= references/VpePreferencesInitializer.java 2009-09-23 15:06:27 UTC (rev 1770= 2) @@ -0,0 +1,37 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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.jsp.preferences; + +import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.core.runtime.preferences.DefaultScope; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.IScopeContext; +import org.jboss.tools.jst.jsp.JspEditorPlugin; + +public class VpePreferencesInitializer extends AbstractPreferenceInitializ= er { + + @Override + public void initializeDefaultPreferences() { + IEclipsePreferences defaultPreferences =3D ((IScopeContext) new DefaultS= cope()).getNode(JspEditorPlugin.PLUGIN_ID); + = + defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOW= N_TAGS, false); + defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS, = false); + defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_SELECTION_TAG_BAR= , false); + defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_= USAGE_AS_EL, false); + defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_= TAG_INSERT, true); + defaultPreferences.putBoolean(IVpePreferencesPage.ASK_CONFIRMATION_ON_CL= OSING_SELECTION_BAR, true); + defaultPreferences.put(IVpePreferencesPage.DEFAULT_VPE_TAB, IVpePreferen= cesPage.DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE); + defaultPreferences.put(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTI= NG, IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE); + defaultPreferences.putInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIG= HTS, IVpePreferencesPage.DEFAULT_VISUAL_SOURCE_EDITORS_WEIGHTS); + = + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jbos= s/tools/jst/jsp/preferences/VpePreferencesInitializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/xpl/CustomSashForm.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2009-09-23 12:58:07 UTC (rev 17701) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2009-09-23 15:06:27 UTC (rev 17702) @@ -1176,7 +1176,7 @@ public static boolean isSourceEditorFirst() { boolean sourceEditorFirst =3D false; String splitting =3D JspEditorPlugin.getDefault().getPreferenceStore() - .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE .equalsIgnoreCase(splitting) || IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE --===============3197259210514323777==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 11:50:47 2009 Content-Type: multipart/mixed; boundary="===============6993015582008703069==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17703 - trunk/hibernatetools/docs/reference/en/images/plugins. Date: Wed, 23 Sep 2009 11:50:47 -0400 Message-ID: <200909231550.n8NFolVX026104@svn01.web.mwc.hst.phx2.redhat.com> --===============6993015582008703069== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-09-23 11:50:47 -0400 (Wed, 23 Sep 2009) New Revision: 17703 Removed: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0_b.png Log: https://jira.jboss.org/jira/browse/JBDS-861 - deleting unnecessary image; Deleted: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0_b.= png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============6993015582008703069==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 11:51:16 2009 Content-Type: multipart/mixed; boundary="===============5025301968730010609==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17704 - trunk/hibernatetools/docs/reference/en/images/plugins. Date: Wed, 23 Sep 2009 11:51:16 -0400 Message-ID: <200909231551.n8NFpGHR026202@svn01.web.mwc.hst.phx2.redhat.com> --===============5025301968730010609== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-09-23 11:51:15 -0400 (Wed, 23 Sep 2009) New Revision: 17704 Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0.png trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0_a.png Log: https://jira.jboss.org/jira/browse/JBDS-861 - adding new images; Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0_a= .png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============5025301968730010609==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 11:53:25 2009 Content-Type: multipart/mixed; boundary="===============1895775919205703581==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17705 - trunk/hibernatetools/docs/reference/en/modules. Date: Wed, 23 Sep 2009 11:53:25 -0400 Message-ID: <200909231553.n8NFrPe5026528@svn01.web.mwc.hst.phx2.redhat.com> --===============1895775919205703581== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2009-09-23 11:53:25 -0400 (Wed, 23 Sep 2009) New Revision: 17705 Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml Log: https://jira.jboss.org/jira/browse/JBDS-861 - updating the 'Creating a Hibe= rnate Mapping File' section; Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-09-23 1= 5:51:15 UTC (rev 17704) +++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-09-23 1= 5:53:25 UTC (rev 17705) @@ -33,11 +33,11 @@ Hibernate mapping files are used to specify how your objects are= related to database tables. = - For creating a skeleton mapping file, i. e. any + To create basic mappings for properties and associations, i. e. g= enerate .hbm.xml - , Hibernate Tools provide a basic wizard which you can br= ing up by navigating + files, Hibernate Tools provide a basic wizard which you = can bring up by navigating New > Hibernate XML mapping file.<= /para> - + At first you'll be asked to select a package or multiple ind= ividual classes to map. Hibernate XML Mapping File Wizard = @@ -48,10 +48,9 @@ = - At first you'll be asked to specify the location and the na= me for a new mapping - file. On the next dialog you should type or browse the class to map.= + Next wizard page lists the mappings to be generated. - Specifying the Class to Map + Mappings to be generated = @@ -59,22 +58,8 @@ - Pressing finish creates the file and opens it in the structured hbm.xml editor. + Pressing finish creates the files. = - If you start the wizard from the selected class, all values wil= l be detected there - automatically. - - - Creating Mapping File for Selected Class - - - - - - - -

--===============1895775919205703581==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 12:09:54 2009 Content-Type: multipart/mixed; boundary="===============7530313811748800615==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17706 - trunk/documentation/qa/docs/Test_Cases/Test_Projects. Date: Wed, 23 Sep 2009 12:09:53 -0400 Message-ID: <200909231609.n8NG9rBJ031034@svn01.web.mwc.hst.phx2.redhat.com> --===============7530313811748800615== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: aklimkovich Date: 2009-09-23 12:09:52 -0400 (Wed, 23 Sep 2009) New Revision: 17706 Added: trunk/documentation/qa/docs/Test_Cases/Test_Projects/TestWorkspaces.rar Log: Added a file remotely Added: trunk/documentation/qa/docs/Test_Cases/Test_Projects/TestWorkspaces.= rar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/qa/docs/Test_Cases/Test_Projects/T= estWorkspaces.rar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============7530313811748800615==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 15:12:30 2009 Content-Type: multipart/mixed; boundary="===============8732135046536099022==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17707 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4713 and 4 other directories. Date: Wed, 23 Sep 2009 15:12:30 -0400 Message-ID: <200909231912.n8NJCURX003111@svn01.web.mwc.hst.phx2.redhat.com> --===============8732135046536099022== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2009-09-23 15:12:29 -0400 (Wed, 23 Sep 2009) New Revision: 17707 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4713/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4713/SelectWholeElement_JBIDE4713.html trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/JsfAllTests.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem= plate/SelectionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/uti= l/SelectionUtil.java Log: RESOLVED - issue JBIDE-4713: Visual selection isn't correct from selection = bar. https://jira.jboss.org/jira/browse/JBIDE-4713 - fixed - added JUnit test Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4713/SelectWholeElement_JBIDE4713.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4713/SelectWholeElement_JBIDE4713.html = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4713/SelectWholeElement_JBIDE4713.html 2009-09-23 19:12:= 29 UTC (rev 17707) @@ -0,0 +1,9 @@ + + + + + Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to= ols/jsf/vpe/jsf/test/JsfAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2009-09-23 16:09:52 UTC (rev 17706) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2009-09-23 19:12:29 UTC (rev 17707) @@ -77,6 +77,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775; import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectAllAndCut_JBIDE4853; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectWholeElement_JBIDE4713; import org.jboss.tools.jsf.vpe.jsf.test.jbide.VPERefreshTest; import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.ui.test.VpeTestSetup; @@ -104,6 +105,7 @@ suite.addTestSuite(JBIDE3519Test.class); suite.addTestSuite(ContextMenuDoubleInsertionTest_JBIDE3888.class); suite.addTestSuite(SelectAllAndCut_JBIDE4853.class); + suite.addTestSuite(SelectWholeElement_JBIDE4713.class); suite.addTestSuite(JBIDE4037Test.class); suite.addTestSuite(JBIDE3734Test.class); suite.addTestSuite(JBIDE3617Test.class); Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools= /jsf/vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/SelectWholeElement_JBIDE4713.java 2009-09-23 19:12:29 = UTC (rev 17707) @@ -0,0 +1,70 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.graphics.Point; +import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.SelectionUtil; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; + +/** + * Tests for JIRA issue JBIDE-4713: + * Visual selection isn't correct from selection bar. + * (https://jira.jboss.org/jira/browse/JBIDE-4713 ) + * = + * @author yradtsevich + */ +public class SelectWholeElement_JBIDE4713 extends VpeTest { + private static final String TEST_PAGE_NAME + =3D "JBIDE/4713/SelectWholeElement_JBIDE4713.html"; //$NON-NLS-1$ + private static final Point SELECTION_START =3D new Point(5, 13); + private static final Point SELECTION_END =3D new Point(5, 46); + private static final String SELECTED_ELEMENT_ID + =3D "selected-element"; //$NON-NLS-1$ + + public SelectWholeElement_JBIDE4713(String name) { + super(name); + } + + public void testSelectWholeElement() throws Throwable { + VpeController vpeController =3D openInVpe(JsfAllTests.IMPORT_PROJECT_NAM= E, + TEST_PAGE_NAME); + + StructuredTextViewer textViewer =3D vpeController.getSourceEditor() + .getTextViewer(); + StyledText textWidget =3D textViewer.getTextWidget(); + + int selectionStartOffset =3D TestUtil.getLinePositionOffcet( + textViewer, SELECTION_START.x, SELECTION_START.y); + int selectionEndOffset =3D TestUtil.getLinePositionOffcet( + textViewer, SELECTION_END.x, SELECTION_END.y); + + textViewer.setSelectedRange(selectionStartOffset, + selectionEndOffset - selectionStartOffset); + TestUtil.waitForIdle(); + + nsIDOMNode selectedNode =3D SelectionUtil.getLastSelectedNode( + vpeController.getPageContext()); = + + assertTrue(selectedNode.getNodeType() =3D=3D nsIDOMNode.ELEMENT_NODE); + nsIDOMElement element =3D (nsIDOMElement) + selectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + + assertEquals(SELECTED_ELEMENT_ID, element.getAttribute(HTML.ATTR_ID)); + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/template/SelectionManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te= mplate/SelectionManager.java 2009-09-23 16:09:52 UTC (rev 17706) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te= mplate/SelectionManager.java 2009-09-23 19:12:29 UTC (rev 17707) @@ -11,10 +11,7 @@ = package org.jboss.tools.vpe.editor.template; = -import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.graphics.Point; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.xml.core.internal.document.NodeImpl; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -252,91 +249,72 @@ */ final public void refreshVisualSelection() { = - IStructuredModel model =3D null; - try { - // checks for null, for case when we close editor and background - // update job is running - if (getSourceEditor().getTextViewer() =3D=3D null) { + // checks for null, for case when we close editor and background + // update job is running + if (getSourceEditor().getTextViewer() =3D=3D null) { = - return; - } - // gets source model for read, model should be released see - // JBIDE-2219 - model =3D StructuredModelManager.getModelManager() - .getExistingModelForRead( - getSourceEditor().getTextViewer().getDocument()); - = - //fix for JBIDE-3805, mareshkau = - if(model=3D=3Dnull) { - return; - } - = - Point range =3D SelectionUtil - .getSourceSelectionRange(getSourceEditor()); + return; + } = - if (range =3D=3D null) - return; + Point range =3D SelectionUtil + .getSourceSelectionRange(getSourceEditor()); = - int focusOffcetInSourceDocument =3D range.x; + if (range =3D=3D null) + return; = - int anchorOffcetInSourceDocument =3D focusOffcetInSourceDocument - + range.y; + int focusOffcetInSourceDocument =3D range.x; = - // get element mapping - VpeNodeMapping nodeMapping =3D SelectionUtil - .getNodeMappingBySourceSelection(model, getDomMapping(), - focusOffcetInSourceDocument, - anchorOffcetInSourceDocument); + int anchorOffcetInSourceDocument =3D focusOffcetInSourceDocument + + range.y; + VpeNodeMapping nodeMapping =3D SelectionUtil + .getNodeMappingBySourceSelection(getSourceEditor(), + getDomMapping()); = - if (nodeMapping =3D=3D null) - return; + if (nodeMapping =3D=3D null) { + return; + } = - // visual node which will be selected - nsIDOMNode targetVisualNode; + // visual node which will be selected + nsIDOMNode targetVisualNode; = - // int visualNodeOffcet =3D - // TextUtil.visualPosition(((Node)targetSourceNode - // ).getNodeValue(),offcetReferenceToSourceNode); + // int visualNodeOffcet =3D + // TextUtil.visualPosition(((Node)targetSourceNode + // ).getNodeValue(),offcetReferenceToSourceNode); = - // if mapping is elementMapping - = - SelectionUtil.clearSelection(selectionController); = - = - if (nodeMapping instanceof VpeElementMapping) { + // if mapping is elementMapping + = + SelectionUtil.clearSelection(selectionController); = + = + if (nodeMapping instanceof VpeElementMapping) { = - VpeElementMapping elementMapping =3D (VpeElementMapping) nodeMapping; + VpeElementMapping elementMapping =3D (VpeElementMapping) nodeMapping; = - VpeTemplate template =3D elementMapping.getTemplate(); + VpeTemplate template =3D elementMapping.getTemplate(); = - targetVisualNode =3D template.getVisualNodeBySourcePosition( - elementMapping, focusOffcetInSourceDocument, - anchorOffcetInSourceDocument, getDomMapping()); + targetVisualNode =3D template.getVisualNodeBySourcePosition( + elementMapping, focusOffcetInSourceDocument, + anchorOffcetInSourceDocument, getDomMapping()); = - NodeData nodeData =3D template.getNodeData(targetVisualNode, - elementMapping.getElementData(), getDomMapping()); - // we can restore cursor position only if we have nodeData and - // range.y=3D=3D0 - if (nodeData !=3D null) { - // restore cursor position in source document - restoreVisualCursorPosition(template, nodeData, - focusOffcetInSourceDocument, - anchorOffcetInSourceDocument); - } - } else { + NodeData nodeData =3D template.getNodeData(targetVisualNode, + elementMapping.getElementData(), getDomMapping()); + // we can restore cursor position only if we have nodeData and + // range.y=3D=3D0 + if (nodeData !=3D null) { + // restore cursor position in source document + restoreVisualCursorPosition(template, nodeData, + focusOffcetInSourceDocument, + anchorOffcetInSourceDocument); + } + } else { = - targetVisualNode =3D nodeMapping.getVisualNode(); - // restore cursor position for source node + targetVisualNode =3D nodeMapping.getVisualNode(); + // restore cursor position for source node // restoreVisualCursorPositionForTextNode(targetVisualNode, // focusOffcetInSourceDocument, model); - } - // here we restore only highlight - getPageContext().getVisualBuilder().setSelectionRectangle( - targetVisualNode); - } finally { - if (model !=3D null) { - model.releaseFromRead(); - } } + // here we restore only highlight + getPageContext().getVisualBuilder().setSelectionRectangle( + targetVisualNode); } = /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/util/SelectionUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/SelectionUtil.java 2009-09-23 16:09:52 UTC (rev 17706) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/SelectionUtil.java 2009-09-23 19:12:29 UTC (rev 17707) @@ -119,6 +119,11 @@ offset, length); } = + /** + * @deprecated This method causes JBIDE-4713. Use + * {@link #getNodeMappingBySourceSelection(StructuredTextEditor, VpeDomMa= pping)} + * instead. + */ public static VpeNodeMapping getNodeMappingBySourceSelection( IStructuredModel model, VpeDomMapping domMapping, int focus, int anchor) { @@ -228,8 +233,15 @@ = IStructuredModel model =3D null; try { + // gets source model for read, model should be released see + // JBIDE-2219 model =3D StructuredModelManager.getModelManager() .getExistingModelForRead(document); + = + //fix for JBIDE-3805, mareshkau = + if(model =3D=3D null) { + return null; + } = int anchor =3D range.x; int focus =3D range.x + range.y; --===============8732135046536099022==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 18:07:14 2009 Content-Type: multipart/mixed; boundary="===============3739178783034488338==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17708 - trunk/birt/plugins/org.jboss.tools.birt.core/resources. Date: Wed, 23 Sep 2009 18:07:14 -0400 Message-ID: <200909232207.n8NM7EcK006566@svn01.web.mwc.hst.phx2.redhat.com> --===============3739178783034488338== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2009-09-23 18:07:14 -0400 (Wed, 23 Sep 2009) New Revision: 17708 Modified: trunk/birt/plugins/org.jboss.tools.birt.core/resources/jboss-seam-birt.j= ar Log: https://jira.jboss.org/jira/browse/JBIDE-4842 p:birt broken on postback (re= storeState and saveState not implemented) Modified: trunk/birt/plugins/org.jboss.tools.birt.core/resources/jboss-seam= -birt.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============3739178783034488338==-- From jbosstools-commits at lists.jboss.org Wed Sep 23 18:43:11 2009 Content-Type: multipart/mixed; boundary="===============1555997824505782462==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17709 - trunk/birt/plugins/org.jboss.tools.birt.core/resources. Date: Wed, 23 Sep 2009 18:43:11 -0400 Message-ID: <200909232243.n8NMhBwV011744@svn01.web.mwc.hst.phx2.redhat.com> --===============1555997824505782462== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2009-09-23 18:43:11 -0400 (Wed, 23 Sep 2009) New Revision: 17709 Modified: trunk/birt/plugins/org.jboss.tools.birt.core/resources/jboss-birt-servle= t.jar Log: https://jira.jboss.org/jira/browse/JBIDE-4929 birt : reportContext.getHttpS= ervletRequest() returns null Modified: trunk/birt/plugins/org.jboss.tools.birt.core/resources/jboss-birt= -servlet.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============1555997824505782462==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 03:48:50 2009 Content-Type: multipart/mixed; boundary="===============3581378766915497306==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17710 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard. Date: Thu, 24 Sep 2009 03:48:50 -0400 Message-ID: <200909240748.n8O7mob5024647@svn01.web.mwc.hst.phx2.redhat.com> --===============3581378766915497306== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2009-09-24 03:48:50 -0400 (Thu, 24 Sep 2009) New Revision: 17710 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/w= izard/SeamBaseOperation.java Log: https://jira.jboss.org/jira/browse/JBIDE-4944 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/se= am/ui/wizard/SeamBaseOperation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= wizard/SeamBaseOperation.java 2009-09-23 22:43:11 UTC (rev 17709) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/= wizard/SeamBaseOperation.java 2009-09-24 07:48:50 UTC (rev 17710) @@ -110,7 +110,7 @@ int index=3D0; for (String[] mapping : fileMappingCopy) { file[index] =3D new File(mapping[1]); - FileUtils.getFileUtils().copyFile(new File(mapping[0]), file[index],fi= lters,true); + FileUtils.getFileUtils().copyFile(new File(mapping[0]), file[index],fi= lters,false); index++; } if(shouldTouchServer(seamPrjSet)) { --===============3581378766915497306==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 05:15:39 2009 Content-Type: multipart/mixed; boundary="===============2521071465144652026==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17711 - workspace. Date: Thu, 24 Sep 2009 05:15:39 -0400 Message-ID: <200909240915.n8O9FdrA009691@svn01.web.mwc.hst.phx2.redhat.com> --===============2521071465144652026== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: aklimkovich Date: 2009-09-24 05:15:39 -0400 (Thu, 24 Sep 2009) New Revision: 17711 Added: workspace/qa Log: Copied remotely Copied: workspace/qa (from rev 17710, trunk/documentation/qa/docs/Test_Case= s/Test_Projects/TestWorkspaces.rar) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============2521071465144652026==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 05:21:09 2009 Content-Type: multipart/mixed; boundary="===============6563945440002381690==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17712 - workspace. Date: Thu, 24 Sep 2009 05:21:09 -0400 Message-ID: <200909240921.n8O9L9xT010592@svn01.web.mwc.hst.phx2.redhat.com> --===============6563945440002381690== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: aklimkovich Date: 2009-09-24 05:21:09 -0400 (Thu, 24 Sep 2009) New Revision: 17712 Removed: workspace/qa Log: Removed file/folder Deleted: workspace/qa =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============6563945440002381690==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 05:33:21 2009 Content-Type: multipart/mixed; boundary="===============1764568294425673873==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17713 - workspace. Date: Thu, 24 Sep 2009 05:33:21 -0400 Message-ID: <200909240933.n8O9XLDM013165@svn01.web.mwc.hst.phx2.redhat.com> --===============1764568294425673873== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: aklimkovich Date: 2009-09-24 05:33:20 -0400 (Thu, 24 Sep 2009) New Revision: 17713 Added: workspace/qa/ Log: Created folder remotely --===============1764568294425673873==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 07:23:24 2009 Content-Type: multipart/mixed; boundary="===============8339385308858447708==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17714 - workspace/qa and 1 other directory. Date: Thu, 24 Sep 2009 07:23:24 -0400 Message-ID: <200909241123.n8OBNOZf002078@svn01.web.mwc.hst.phx2.redhat.com> --===============8339385308858447708== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: aklimkovich Date: 2009-09-24 07:23:24 -0400 (Thu, 24 Sep 2009) New Revision: 17714 Added: workspace/qa/TestWorkspaces.rar Removed: trunk/documentation/qa/docs/Test_Cases/Test_Projects/TestWorkspaces.rar Log: Moved remotely Deleted: trunk/documentation/qa/docs/Test_Cases/Test_Projects/TestWorkspace= s.rar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Copied: workspace/qa/TestWorkspaces.rar (from rev 17713, trunk/documentatio= n/qa/docs/Test_Cases/Test_Projects/TestWorkspaces.rar) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============8339385308858447708==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 09:53:59 2009 Content-Type: multipart/mixed; boundary="===============3755392641303917333==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17716 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist. Date: Thu, 24 Sep 2009 09:53:59 -0400 Message-ID: <200909241353.n8ODrxRs030362@svn01.web.mwc.hst.phx2.redhat.com> --===============3755392641303917333== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2009-09-24 09:53:59 -0400 (Thu, 24 Sep 2009) New Revision: 17716 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/co= ntentassist/AbstractXMLContentAssistProcessor.java Log: JBIDE-2332 CA with proposal list for comonent's atributes doesn't work befo= re double quotes. Issue is fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/contentassist/AbstractXMLContentAssistProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/AbstractXMLContentAssistProcessor.java 2009-09-24 13:37:24 UTC= (rev 17715) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/c= ontentassist/AbstractXMLContentAssistProcessor.java 2009-09-24 13:53:59 UTC= (rev 17716) @@ -269,8 +269,24 @@ domnode =3D prevnode; } } + = return super.getCompletionRegion(documentPosition, domnode); } + = + protected ITextRegion getCompletionRegion(int offset, IStructuredDocument= Region sdRegion) { + ITextRegion region =3D super.getCompletionRegion(offset, sdRegion); + if (region !=3D null && region.getType() =3D=3D DOMRegionContext.UNDEFIN= ED) { + // FIX: JBIDE-2332 CA with proposal list for comonent's atributes doesn= 't work before double quotes. = + // Sometimes, especially if we have a broken XML node, the region retur= ned has UNDEFINED type. + // If so, we're try to use the prevoius region, which probably will be = the region of type XML_TAG_NAME. + = + ITextRegion previousRegion =3D sdRegion.getRegionAtCharacterOffset(offs= et - 1); + if ((previousRegion !=3D null) && (previousRegion !=3D region) && (prev= iousRegion.getTextLength() < previousRegion.getLength())) { + region =3D previousRegion; + } + } + return region; + } /* * (non-Javadoc) * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssi= stProcessor#computeTagNameProposals(int, java.lang.String, org.eclipse.wst.= sse.core.internal.provisional.text.ITextRegion, org.eclipse.wst.xml.core.in= ternal.provisional.document.IDOMNode, org.eclipse.wst.xml.core.internal.pro= visional.document.IDOMNode) --===============3755392641303917333==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 10:56:03 2009 Content-Type: multipart/mixed; boundary="===============6184202670765409671==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17717 - in trunk/jst/plugins: org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog and 2 other directories. Date: Thu, 24 Sep 2009 10:56:02 -0400 Message-ID: <200909241456.n8OEu2x8011564@svn01.web.mwc.hst.phx2.redhat.com> --===============6184202670765409671== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: sdzmitrovich Date: 2009-09-24 10:56:02 -0400 (Thu, 24 Sep 2009) New Revision: 17717 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/pr= operties/CSSPropertyPage.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/AbstractCSSDialog.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/common/StyleAttributes.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/common/Util.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/tabs/BaseTabControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/tabs/TabQuickEditControl.java Log: https://jira.jboss.org/jira/browse/JBIDE-4940 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst= /css/properties/CSSPropertyPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/p= roperties/CSSPropertyPage.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/p= roperties/CSSPropertyPage.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -14,7 +14,6 @@ import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.observable.ChangeEvent; import org.eclipse.core.databinding.observable.IChangeListener; -import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -50,8 +49,7 @@ super(tabbedPropertySheetPageContributor); bindingContext =3D new DataBindingContext(); styleAttributes =3D new StyleAttributes(); - ((IObservable) styleAttributes.getAttributeMap()) - .addChangeListener(this); + styleAttributes.addChangeListener(this); this.part =3D part; = } @@ -99,7 +97,7 @@ || (!selectedObject.equals(newSelectedObject))) super.selectionChanged(part, selection); selectedObject =3D newSelectedObject; - = + update(); = } @@ -109,12 +107,10 @@ public void update() { = if (selectedObject instanceof StyleContainer) { - ((IObservable) getStyleAttributes().getAttributeMap()) - .removeChangeListener(this); + getStyleAttributes().removeChangeListener(this); getStyleAttributes().setStyleProperties( ((StyleContainer) selectedObject).getStyleAttributes()); - ((IObservable) getStyleAttributes().getAttributeMap()) - .addChangeListener(this); + getStyleAttributes().addChangeListener(this); } = } @@ -125,7 +121,7 @@ = ((StyleContainer) selectedObject) .applyStyleAttributes(getStyleAttributes() - .getAttributeMap()); + .getStyleProperties()); } = notifySelectionChanged(getCurrentSelection()); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/AbstractCSSDialog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/AbstractCSSDialog.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/AbstractCSSDialog.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -104,15 +104,14 @@ dialogContainer.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, true)); = - ((IObservable) getStyleAttributes().getAttributeMap()) - .addChangeListener(new IChangeListener() { + getStyleAttributes().addChangeListener(new IChangeListener() { = - public void handleChange(ChangeEvent event) { - handleStyleChanged(); + public void handleChange(ChangeEvent event) { + handleStyleChanged(); = - } + } = - }); + }); = aggregateStatus =3D new AggregateValidationStatus( getBindingContext().getValidationStatusProviders(), @@ -230,7 +229,7 @@ StringBuffer html =3D new StringBuffer(Constants.OPEN_DIV_TAG); = for (Map.Entry styleItem : getStyleAttributes() - .getAttributeMap().entrySet()) { + .entrySet()) { = html.append(styleItem.getKey() + Constants.COLON + styleItem.getValue() + Constants.SEMICOLON); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/common/StyleAttributes.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/StyleAttributes.java 2009-09-24 13:53:59 UTC (rev 1= 7716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/StyleAttributes.java 2009-09-24 14:56:02 UTC (rev 1= 7717) @@ -14,6 +14,8 @@ import java.util.Set; import java.util.Map.Entry; = +import org.eclipse.core.databinding.observable.IChangeListener; +import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.WritableMap; = /** @@ -21,7 +23,7 @@ */ public class StyleAttributes { = - private Map attributeMap =3D null; + private IObservableMap attributeMap =3D null; = /** * Default constructor. @@ -31,24 +33,16 @@ } = /** - * Gets attribute map. - * = - * @return map of attributes - */ - public Map getAttributeMap() { - return attributeMap; - } - - /** * Add attribute with the given name and value. * = * @param name + * = * the name of attribute * @param value * the value of attribute */ - public void addAttribute(String name, String value) { - attributeMap.put(name, value); + public String put(String name, String value) { + return (String) attributeMap.put(name.toLowerCase(), value); } = /** @@ -57,8 +51,8 @@ * @param name * the name of attribute to be removed */ - public void removeAttribute(String name) { - attributeMap.remove(name); + public void remove(String name) { + attributeMap.remove(name.toLowerCase()); } = /** @@ -75,8 +69,8 @@ * the name of attribute to be returned * @return attribute value */ - public String getAttribute(String name) { - String value =3D attributeMap.get(name); + public String get(Object name) { + String value =3D (String) attributeMap.get(name); return value !=3D null ? value : Constants.EMPTY; } = @@ -99,9 +93,17 @@ */ public void setStyleProperties(Map properties) { attributeMap.clear(); - attributeMap.putAll(properties); + + for (Entry entry : properties.entrySet()) { + attributeMap.put(entry.getKey().toLowerCase(), entry.getValue()); + } + } = + public Map getStyleProperties() { + return attributeMap; + } + /** * String representation of style attributes. * = @@ -118,4 +120,17 @@ } return buf.toString(); } + + public IObservableMap getObservableMap() { + return attributeMap; + } + + public void addChangeListener(IChangeListener listener) { + attributeMap.addChangeListener(listener); + } + + public void removeChangeListener(IChangeListener listener) { + attributeMap.removeChangeListener(listener); + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/common/Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/Util.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/Util.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -100,7 +100,7 @@ = for (String str : set) { ArrayList list =3D elementMap.get(str); - if(list.contains(name)) { + if(list.contains(name.toLowerCase())) { return true; } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/tabs/BaseTabControl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/tabs/BaseTabControl.java 2009-09-24 13:53:59 UTC (rev 1771= 6) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/tabs/BaseTabControl.java 2009-09-24 14:56:02 UTC (rev 1771= 7) @@ -16,7 +16,6 @@ import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.observable.Observables; -import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdaptable; @@ -270,10 +269,10 @@ = List values =3D CSSConstants.CSS_STYLE_VALUES_MAP .get(attribute); - = + if ((values !=3D null) && !values.contains(value)) value =3D adjustBackgroundURL((String) value); - = + return super.doSet(observableValue, value); } }, null); @@ -464,9 +463,8 @@ } = private IObservableValue createAttributeObservableValue(String attributeN= ame) { - return Observables.observeMapEntry( - (IObservableMap) getStyleAttributes().getAttributeMap(), - attributeName, String.class); + return Observables.observeMapEntry(getStyleAttributes() + .getObservableMap(), attributeName, String.class); } = private void bind(Widget widget, String attribute) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/tabs/TabQuickEditControl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/tabs/TabQuickEditControl.java 2009-09-24 13:53:59 UTC (rev= 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/tabs/TabQuickEditControl.java 2009-09-24 14:56:02 UTC (rev= 17717) @@ -61,7 +61,7 @@ = for (String key : listKeys) { = - String value =3D getStyleAttributes().getAttribute(key); + String value =3D getStyleAttributes().get(key); if (value !=3D null && value.length() > 0) { addLabel(this, key); createControl(this, key); --===============6184202670765409671==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 13:13:18 2009 Content-Type: multipart/mixed; boundary="===============2086935773166200986==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17718 - in trunk/hibernatetools: plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions and 2 other directories. Date: Thu, 24 Sep 2009 13:13:17 -0400 Message-ID: <200909241713.n8OHDHFx005903@svn01.web.mwc.hst.phx2.redhat.com> --===============2086935773166200986== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2009-09-24 13:13:17 -0400 (Thu, 24 Sep 2009) New Revision: 17718 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/DiagramViewer.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/= tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MA= NIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jbo= ss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.ja= va Log: https://jira.jboss.org/jira/browse/JBIDE-4873 - fix for clause (7) save ins= ide the workspace Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-09-24 14:56:02 = UTC (rev 17717) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-09-24 17:13:17 = UTC (rev 17718) @@ -292,29 +292,49 @@ ObjectEditorInput objectEditorInput =3D (ObjectEditorInput)input; ConsoleConfiguration configuration =3D objectEditorInput.getConfiguratio= n(); Object obj =3D objectEditorInput.getObject(); + setPartName(DiagramViewerMessages.DiagramViewer_diagram_for + " " + getD= iagramName(obj)); //$NON-NLS-1$ if (obj instanceof RootClass) { RootClass rootClass =3D (RootClass)obj; - setPartName(DiagramViewerMessages.DiagramViewer_diagram_for + " " + get= ItemName(rootClass)); //$NON-NLS-1$ ormDiagram =3D new OrmDiagram(configuration, rootClass); } else if (obj instanceof RootClass[]) { RootClass[] rootClasses =3D (RootClass[])obj; + ormDiagram =3D new OrmDiagram(configuration, rootClasses); + } + super.setInput(input); + loadProperties(); + } + + protected String getDiagramName(Object obj) { + String name =3D ""; //$NON-NLS-1$ + if (obj instanceof RootClass) { + RootClass rootClass =3D (RootClass)obj; + name =3D getItemName(rootClass); + } else if (obj instanceof RootClass[]) { + RootClass[] rootClasses =3D (RootClass[])obj; ArrayList names =3D new ArrayList(); for (int i =3D 0; i < rootClasses.length; i++) { names.add(getItemName(rootClasses[i])); } // sort to get same name for same combinations of entities Collections.sort(names); - String name =3D names.size() > 0 ? names.get(0) : ""; //$NON-NLS-1$ + name =3D names.size() > 0 ? names.get(0) : ""; //$NON-NLS-1$ for (int i =3D 1; i < rootClasses.length; i++) { name +=3D " & " + names.get(i); //$NON-NLS-1$ } - setPartName(DiagramViewerMessages.DiagramViewer_diagram_for + " " + nam= e); //$NON-NLS-1$ - ormDiagram =3D new OrmDiagram(configuration, rootClasses); } - super.setInput(input); - loadProperties(); + return name; } = + public String getDiagramName() { + IEditorInput input =3D getEditorInput(); + Object obj =3D null; + if (input instanceof ObjectEditorInput) { + ObjectEditorInput objectEditorInput =3D (ObjectEditorInput)input; + obj =3D objectEditorInput.getObject(); + } + return getDiagramName(obj); + } + /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org= /jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-09-= 24 14:56:02 UTC (rev 17717) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss= /tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-09-= 24 17:13:17 UTC (rev 17718) @@ -13,7 +13,12 @@ import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; = +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.SWTGraphics; @@ -21,6 +26,7 @@ import org.eclipse.gef.LayerConstants; import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Device; @@ -28,7 +34,8 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoader; -import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.ui.actions.WorkspaceModifyOperation; +import org.eclipse.ui.dialogs.SaveAsDialog; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; @@ -40,7 +47,8 @@ public static final String[] dialogFilterNames =3D new String[] { Diagram= ViewerMessages.ExportImageAction_png_format, DiagramViewerMessages.ExportImageAction_jpg_format, DiagramViewerMessage= s.ExportImageAction_bmp_format }; = - private FileDialog saveDialog =3D null; + //private FileDialog saveDialog =3D null; + private SaveAsDialog saveDialog =3D null; private boolean showErrDialog =3D true; public static final ImageDescriptor img =3D = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/export.png");= //$NON-NLS-1$ @@ -58,7 +66,7 @@ * = * @param saveDialog */ - public void setSaveDialog(FileDialog saveDialog) { + public void setSaveDialog(SaveAsDialog saveDialog) { this.saveDialog =3D saveDialog; } = @@ -68,49 +76,76 @@ = public void run() { = + boolean createdSaveDialog =3D false; if (saveDialog =3D=3D null) { - saveDialog =3D new FileDialog( - getDiagramViewer().getSite().getShell(), SWT.SAVE); + saveDialog =3D new SaveAsDialog(getDiagramViewer().getSite().getWorkben= chWindow().getShell()); + createdSaveDialog =3D true; } - saveDialog.setFilterExtensions(dialogFilterExtensions); - saveDialog.setFilterNames(dialogFilterNames); - - String filePath =3D saveDialog.open(); - saveDialog =3D null; - if (filePath =3D=3D null || filePath.trim().length() =3D=3D 0) { + saveDialog.setOriginalName(getDiagramViewer().getDiagramName()); + saveDialog.open(); + final IPath pathSave =3D saveDialog.getResult(); = + if (pathSave =3D=3D null) { return; } = - IFigure fig =3D ((ScalableFreeformRootEditPart) getDiagramViewer() + final IFigure fig =3D ((ScalableFreeformRootEditPart) getDiagramViewer() .getEditPartViewer().getRootEditPart()) .getLayer(LayerConstants.PRINTABLE_LAYERS); - int imageType =3D SWT.IMAGE_BMP; - if (filePath.toLowerCase().endsWith(".jpg")) { //$NON-NLS-1$ - imageType =3D SWT.IMAGE_JPEG; - } else if (filePath.toLowerCase().endsWith(".png")) { //$NON-NLS-1$ - imageType =3D SWT.IMAGE_PNG; - } - FileOutputStream outStream =3D null; - try { - byte[] imageData =3D createImage(fig, imageType); - outStream =3D new FileOutputStream(filePath); - outStream.write(imageData); - outStream.flush(); - } catch (IOException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("ExportImageAction"= , e); //$NON-NLS-1$ - if (showErrDialog) { - MessageDialog.openInformation(getDiagramViewer().getSite().getShell(), - DiagramViewerMessages.ExportImageAction_error, DiagramViewerMessages.= ExportImageAction_failed_to_export_image + e.getMessage()); + int imageTypeTmp =3D SWT.IMAGE_BMP; + IWorkspace workspace =3D ResourcesPlugin.getWorkspace(); + String ext =3D pathSave.getFileExtension(); + if (ext !=3D null) { + ext =3D ext.toLowerCase(); + if (ext.endsWith("jpg")) { //$NON-NLS-1$ + imageTypeTmp =3D SWT.IMAGE_JPEG; + } else if (ext.endsWith("png")) { //$NON-NLS-1$ + imageTypeTmp =3D SWT.IMAGE_PNG; + } else if (ext.endsWith("gif")) { //$NON-NLS-1$ + imageTypeTmp =3D SWT.IMAGE_GIF; + } else if (ext.endsWith("bmp")) { //$NON-NLS-1$ + imageTypeTmp =3D SWT.IMAGE_BMP; } } - finally { - if (outStream !=3D null) { + IPath pathTmp =3D workspace.getRoot().getFullPath().append(pathSave); + pathTmp =3D workspace.getRoot().getLocation().append(pathTmp); + if (ext =3D=3D null) { + pathTmp =3D pathTmp.addFileExtension("bmp"); //$NON-NLS-1$ + } + final IPath path =3D pathTmp; + final int imageType =3D imageTypeTmp; + = + WorkspaceModifyOperation op =3D new WorkspaceModifyOperation() { + public void execute(final IProgressMonitor monitor) { + FileOutputStream outStream =3D null; try { - outStream.close(); + byte[] imageData =3D createImage(fig, imageType); + outStream =3D new FileOutputStream(path.toString()); + outStream.write(imageData); + outStream.flush(); } catch (IOException e) { - // ignore + HibernateConsolePlugin.getDefault().logErrorMessage("ExportImageActio= n", e); //$NON-NLS-1$ + if (showErrDialog) { + MessageDialog.openInformation(getDiagramViewer().getSite().getShell(= ), + DiagramViewerMessages.ExportImageAction_error, DiagramViewerMessage= s.ExportImageAction_failed_to_export_image + e.getMessage()); + } } + finally { + if (outStream !=3D null) { + try { + outStream.close(); + } catch (IOException e) { + // ignore + } + } + } } + }; + try { + new ProgressMonitorDialog( + createdSaveDialog ? getDiagramViewer().getSite().getWorkbenchWindow()= .getShell() : null) + .run(false, true, op); + } catch (InvocationTargetException e) { + } catch (InterruptedException e) { } } = Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META= -INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/M= ANIFEST.MF 2009-09-24 14:56:02 UTC (rev 17717) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/M= ANIFEST.MF 2009-09-24 17:13:17 UTC (rev 17718) @@ -7,6 +7,7 @@ org.eclipse.wst.common.project.facet.ui;bundle-version=3D"1.3.0", org.eclipse.jdt.core, org.eclipse.gef, + org.eclipse.ui.ide, org.hibernate.eclipse.console.test, org.jboss.tools.hibernate.ui, org.hibernate.eclipse Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/= org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageAction= Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.j= ava 2009-09-24 14:56:02 UTC (rev 17717) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jb= oss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.j= ava 2009-09-24 17:13:17 UTC (rev 17718) @@ -12,6 +12,10 @@ = import java.io.File; = +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.SWTGraphics; import org.eclipse.draw2d.geometry.Rectangle; @@ -20,7 +24,7 @@ import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.ui.dialogs.SaveAsDialog; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAct= ion; import org.jmock.Expectations; @@ -44,24 +48,30 @@ = public void testAction() { = - final DiagramViewer editor =3D context.mock(DiagramViewer.class);; - final FileDialog saveDialog =3D context.mock(FileDialog.class);; - final GraphicalViewer graphicalViewer =3D context.mock(GraphicalViewer.c= lass);; - final ScalableFreeformRootEditPart scalableFreeformRootEditPart =3D cont= ext.mock(ScalableFreeformRootEditPart.class);; - final IFigure figure =3D context.mock(IFigure.class);; - final Control control =3D context.mock(Control.class);; - final Display display =3D context.mock(Display.class);; + final DiagramViewer editor =3D context.mock(DiagramViewer.class); + final SaveAsDialog saveDialog =3D context.mock(SaveAsDialog.class); + final GraphicalViewer graphicalViewer =3D context.mock(GraphicalViewer.c= lass); + final ScalableFreeformRootEditPart scalableFreeformRootEditPart =3D cont= ext.mock(ScalableFreeformRootEditPart.class); + final IFigure figure =3D context.mock(IFigure.class); + final Control control =3D context.mock(Control.class); + final Display display =3D context.mock(Display.class); final Rectangle rectangle =3D new Rectangle(0, 0, 20, 10); final String filePath =3D "test.jpg"; //$NON-NLS-1$ + final IPath resPath =3D new Path(filePath); = context.checking(new Expectations() { { - allowing(saveDialog).setFilterExtensions(ExportImageAction.dialogFilte= rExtensions); - allowing(saveDialog).setFilterNames(ExportImageAction.dialogFilterName= s); + allowing(editor).getDiagramName(); + will(returnValue(filePath)); = + allowing(saveDialog).setOriginalName(filePath); + oneOf(saveDialog).open(); - will(returnValue(filePath)); + will(returnValue(0)); = + oneOf(saveDialog).getResult(); + will(returnValue(resPath)); + allowing(editor).getSite(); will(returnValue(null)); = @@ -99,7 +109,10 @@ exportImageAction.setShowErrDialog(false); exportImageAction.run(); // test is the file created - File file =3D new File(filePath); + IWorkspace workspace =3D ResourcesPlugin.getWorkspace(); + IPath path =3D workspace.getRoot().getFullPath().append(resPath); + path =3D workspace.getRoot().getLocation().append(path); + File file =3D path.toFile(); assertTrue(file.exists() && file.isFile()); // boolean res =3D file.delete(); --===============2086935773166200986==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 13:29:49 2009 Content-Type: multipart/mixed; boundary="===============5308995640570813768==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17719 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar. Date: Thu, 24 Sep 2009 13:29:48 -0400 Message-ID: <200909241729.n8OHTmgE008866@svn01.web.mwc.hst.phx2.redhat.com> --===============5308995640570813768== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2009-09-24 13:29:48 -0400 (Thu, 24 Sep 2009) New Revision: 17719 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/Sel= ectionBar.java Log: RESOLVED - issue JBIDE-4945: VPE Selection Bar: provide the ability to sele= ct tags back and forward. = https://jira.jboss.org/jira/browse/JBIDE-4945 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/sel= bar/SelectionBar.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/Se= lectionBar.java 2009-09-24 17:13:17 UTC (rev 17718) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/Se= lectionBar.java 2009-09-24 17:29:48 UTC (rev 17719) @@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; +import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.IWorkbenchGraphicConstants; @@ -76,7 +77,6 @@ = private Splitter splitter; = - private boolean resizeListenerAdded =3D false; private VpeController vpeController =3D null; private ToolBar selBar =3D null; private FormData selBarData; @@ -95,6 +95,7 @@ = private ImageButton arrowButton; private Node currentSelectedNode =3D null; + private Node currentLastNode =3D null; = // private ToolItem arrowButton; = @@ -122,6 +123,11 @@ // Main composite of the visible splitter cmpToolBar =3D new Composite(splitter, SWT.NONE); cmpToolBar.setLayout(new FormLayout()); + cmpToolBar.addListener(SWT.Resize, new Listener() { + public void handleEvent(Event event) { + updateNodes(true); + } + }); = final Image closeImage =3D PlatformUI.getWorkbench().getSharedImages() .getImage(ISharedImages.IMG_TOOL_DELETE); @@ -307,10 +313,54 @@ = if (currentSelectedNode =3D=3D node && !forceUpdate) { return; - } else { - currentSelectedNode =3D node; } = + final boolean ancestorSelected =3D isAncestor(node, currentLastNode); + if (ancestorSelected) { + if (forceUpdate) { + // reinitialize selBar with currentLastNode + setSelBarItems(currentLastNode); + } else { + // deselect currentSelectedNode + setNodeSelected(currentSelectedNode, false); + } + } else { + setSelBarItems(node); + currentLastNode =3D node; + } + + setNodeSelected(node, true); + currentSelectedNode =3D node; + } + + /** + * Sets the selection state of the given node in the selection bar. + */ + private void setNodeSelected(Node node, boolean selected) { + for (ToolItem item : selBar.getItems()) { + if (item.getData() =3D=3D node) { + item.setSelection(selected); + return; + } + } + + if (dropDownMenu =3D=3D null) { + return; + } + + for (MenuItem item : dropDownMenu.getItems()) { + if (item.getData() =3D=3D node) { + item.setSelection(selected); + return; + } + } + } + + /** + * Cleans {@link #selBar} and adds to it buttons which + * appropriate the {@code node} and all its ancestors. + */ + private void setSelBarItems(Node node) { // bug was fixed when toolbar are not shown for resizeble components cmpToolBar.layout(); splitter.getParent().layout(true, true); @@ -323,11 +373,12 @@ = int elementCounter =3D 0; while (node !=3D null - && (node.getNodeType() =3D=3D Node.ELEMENT_NODE || node.getNodeType() = =3D=3D Node.COMMENT_NODE)) { + && (node.getNodeType() =3D=3D Node.ELEMENT_NODE + || node.getNodeType() =3D=3D Node.COMMENT_NODE)) { addNodeListenerTo(node); = if (dropDownMenu =3D=3D null) { - ToolItem item =3D new ToolItem(selBar, SWT.FLAT, 1); + ToolItem item =3D new ToolItem(selBar, SWT.FLAT | SWT.CHECK, 1); item.addSelectionListener(this); item.setData(node); item.setText(node.getNodeName()); @@ -339,7 +390,7 @@ } = if (dropDownMenu !=3D null) { - MenuItem menuItem =3D new MenuItem(dropDownMenu, SWT.PUSH, 0); + MenuItem menuItem =3D new MenuItem(dropDownMenu, SWT.CHECK, 0); menuItem.addSelectionListener(this); menuItem.setText(node.getNodeName()); menuItem.setData(node); @@ -354,18 +405,28 @@ if (node !=3D null && node.getNodeType() =3D=3D Node.DOCUMENT_NODE) { addNodeListenerTo(node); } + } = - if (!resizeListenerAdded ) { - cmpToolBar.addListener(SWT.Resize, new Listener() { - public void handleEvent(Event event) { - updateNodes(true); - } - }); - resizeListenerAdded =3D true; + /** + * Checks if the {@code potentialAncestor} is an ancestor of + * {@code potentialAncestor node}. + */ + private boolean isAncestor(Node potentialAncestor, Node node) { + if (potentialAncestor =3D=3D null || node =3D=3D null) { + return false; } + + Node curAncestor =3D node; + while ((curAncestor =3D curAncestor.getParentNode()) !=3D null) { + if (potentialAncestor =3D=3D curAncestor) { + return true; + } + } + + return false; } = - /** + /** * Deletes all items (except the first item-arrow button) * from the given {@code #toolBar}. */ @@ -478,8 +539,18 @@ } = public void widgetSelected(SelectionEvent e) { + Widget widget =3D e.widget; + = + /* ensure that the ToolItem or MenuItem is selected + * (for repeated clicks on the same widget)*/ + if (widget instanceof ToolItem) { + ((ToolItem)widget).setSelection(true); + } else if (widget instanceof MenuItem) { + ((MenuItem)widget).setSelection(true); + } + SelectionUtil.setSourceSelection(vpeController.getPageContext(), - (Node) e.widget.getData()); + (Node) widget.getData()); } = public void widgetDefaultSelected(SelectionEvent e) { --===============5308995640570813768==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 16:48:09 2009 Content-Type: multipart/mixed; boundary="===============8164843192245679117==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17720 - in trunk/maven/plugins: org.jboss.tools.maven.seam and 4 other directories. Date: Thu, 24 Sep 2009 16:48:09 -0400 Message-ID: <200909242048.n8OKm9D1015168@svn01.web.mwc.hst.phx2.redhat.com> --===============8164843192245679117== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2009-09-24 16:48:08 -0400 (Thu, 24 Sep 2009) New Revision: 17720 Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/configurators/PortletProjectConfigurator.java Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven= /core/libprov/MavenLibraryProviderInstallOperation.java trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/MavenSeamActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/configurators/JSFProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/configurators/SeamProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/preferences/SeamConfiguratorPreferencePage.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven= /seam/preferences/SeamConfiguratorPreferencesInitializer.java Log: https://jira.jboss.org/jira/browse/JBIDE-4888 Add m2eclipse configurator fo= r portlet facets Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tool= s/maven/core/libprov/MavenLibraryProviderInstallOperation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/mave= n/core/libprov/MavenLibraryProviderInstallOperation.java 2009-09-24 17:29:4= 8 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/mave= n/core/libprov/MavenLibraryProviderInstallOperation.java 2009-09-24 20:48:0= 8 UTC (rev 17720) @@ -35,6 +35,9 @@ IProject project =3D facetedProject.getProject(); IFile pom =3D project.getFile(IMavenConstants.POM_FILE_NAME); MavenLibraryProviderInstallOperationConfig mavenConfig =3D (MavenLibrary= ProviderInstallOperationConfig) config; + if (mavenConfig.getModel() =3D=3D null) { + return; + } if (pom.exists()) { // JBoss Maven Integration facet has been executed = MavenModelManager modelManager =3D MavenPlugin.getDefault().getMavenMod= elManager(); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.= MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 200= 9-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 200= 9-09-24 20:48:08 UTC (rev 17720) @@ -8,12 +8,14 @@ org.eclipse.core.runtime, org.jboss.tools.maven.core, org.jboss.tools.seam.core, + org.jboss.tools.portlet.core, org.jboss.tools.seam.ui, org.jboss.tools.common.model, org.maven.ide.components.maven_model_edit, org.eclipse.jst.j2ee.core, org.eclipse.jst.j2ee, - org.eclipse.wst.common.emfworkbench.integration + org.eclipse.wst.common.emfworkbench.integration, + org.eclipse.jst.jsf.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-09-24 17= :29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-09-24 20= :48:08 UTC (rev 17720) @@ -21,6 +21,13 @@ name=3D"JSF Project configurator" priority=3D"150"/> = + + + + = dependencies =3D mavenProject.getDependencies(); + for (Dependency dependency:dependencies) { + String groupId =3D dependency.getGroupId(); + if (groupId !=3D null && (groupId.equals(gid)) ) { + String artifactId =3D dependency.getArtifactId(); + if (artifactId !=3D null && artifactId.equals(aid)) { + return dependency.getVersion(); + } = + } + } + return null; + } + = + public IDataModel createJSFDataModel(IFacetedProject fproj, IProjectFacet= Version facetVersion) { + IDataModel config =3D (IDataModel) new JSFFacetInstallDataModelProvider(= ).create(); + LibraryInstallDelegate libraryDelegate =3D new LibraryInstallDelegate(fp= roj, facetVersion); + ILibraryProvider provider =3D LibraryProviderFramework.getProvider("jsf-= no-op-library-provider"); //$NON-NLS-1$ + libraryDelegate.setLibraryProvider(provider); + config.setProperty(IJSFFacetInstallDataModelProperties.LIBRARY_PROVIDER_= DELEGATE, libraryDelegate); + return config; + } } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tool= s/maven/seam/configurators/JSFProjectConfigurator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/configurators/JSFProjectConfigurator.java 2009-09-24 17:29:48 UTC (r= ev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/configurators/JSFProjectConfigurator.java 2009-09-24 20:48:08 UTC (r= ev 17720) @@ -1,68 +1,29 @@ package org.jboss.tools.maven.seam.configurators; = -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.apache.maven.model.Dependency; import org.apache.maven.project.MavenProject; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jst.j2ee.application.Application; -import org.eclipse.jst.j2ee.application.EjbModule; -import org.eclipse.jst.j2ee.application.Module; -import org.eclipse.jst.j2ee.application.WebModule; -import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit; -import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; -import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDel= egate; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFr= amework; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDat= aModelProperties; +import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallData= ModelProvider; import org.eclipse.wst.common.componentcore.ModuleCoreNature; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstall= DataModelProvider; import org.jboss.tools.maven.seam.MavenSeamActivator; -import org.jboss.tools.seam.core.ISeamProject; -import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.core.SeamUtil; -import org.jboss.tools.seam.core.project.facet.SeamRuntime; -import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; -import org.jboss.tools.seam.core.project.facet.SeamVersion; -import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataMode= lProperties; import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDa= taModelProvider; -import org.jboss.tools.seam.ui.wizard.SeamWizardUtils; -import org.maven.ide.eclipse.MavenPlugin; -import org.maven.ide.eclipse.core.IMavenConstants; import org.maven.ide.eclipse.project.IMavenProjectFacade; import org.maven.ide.eclipse.project.MavenProjectChangedEvent; -import org.maven.ide.eclipse.project.MavenProjectManager; import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigura= tor; import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequ= est; -import org.osgi.service.prefs.BackingStoreException; = public class JSFProjectConfigurator extends AbstractProjectConfigurator { = @@ -92,7 +53,6 @@ @Override public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException { - // adds Seam capabilities if there are Seam dependencies MavenProject mavenProject =3D request.getMavenProject(); IProject project =3D request.getProject(); configureInternal(mavenProject,project, monitor); @@ -159,30 +119,28 @@ throws CoreException { if (!fproj.hasProjectFacet(jsfFacet)) { if (jsfVersionString.startsWith("1.1")) { //$NON-NLS-1$ - fproj.installProjectFacet(jsfVersion11, null, monitor); = + IDataModel model =3D MavenSeamActivator.getDefault().createJSFDataMode= l(fproj,jsfVersion11); + fproj.installProjectFacet(jsfVersion11, model, monitor); = } if (jsfVersionString.startsWith("1.2")) { //$NON-NLS-1$ - fproj.installProjectFacet(jsfVersion12, null, monitor); = + IDataModel model =3D MavenSeamActivator.getDefault().createJSFDataMode= l(fproj,jsfVersion12); + fproj.installProjectFacet(jsfVersion12, model, monitor); = } // FIXME if (jsfVersionString.startsWith("2.0")) { //$NON-NLS-1$ - fproj.installProjectFacet(jsfVersion12, null, monitor); = + IDataModel model =3D MavenSeamActivator.getDefault().createJSFDataMode= l(fproj,jsfVersion12); + fproj.installProjectFacet(jsfVersion12, model, monitor); = } } } - + = private String getJSFVersion(MavenProject mavenProject) { - List dependencies =3D mavenProject.getDependencies(); - for (Dependency dependency:dependencies) { - String groupId =3D dependency.getGroupId(); - if (groupId !=3D null && (JSF_API_GROUP_ID.equals(groupId) || JSF_AP= I2_GROUP_ID.equals(groupId)) ) { - String artifactId =3D dependency.getArtifactId(); - if (artifactId !=3D null && JSF_API_ARTIFACT_ID.equals(artifactId))= { - return dependency.getVersion(); - } = - } - } - return null; + String version =3D null; + version =3D MavenSeamActivator.getDefault().getDependencyVersion(mavenPr= oject, JSF_API_GROUP_ID, JSF_API_ARTIFACT_ID); + if (version =3D=3D null) { + version =3D MavenSeamActivator.getDefault().getDependencyVersion(mavenP= roject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID); + } + return version; } = } Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/m= aven/seam/configurators/PortletProjectConfigurator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/configurators/PortletProjectConfigurator.java = (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/configurators/PortletProjectConfigurator.java 2009-09-24 20:48:08 UT= C (rev 17720) @@ -0,0 +1,168 @@ +package org.jboss.tools.maven.seam.configurators; + +import org.apache.maven.project.MavenProject; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDel= egate; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFr= amework; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.tools.maven.core.IJBossMavenConstants; +import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstall= DataModelProvider; +import org.jboss.tools.maven.seam.MavenSeamActivator; +import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.internal.project.facet.JSFPortletFacet= InstallDataModelProvider; +import org.jboss.tools.portlet.core.internal.project.facet.PortletFacetIns= tallDataModelProvider; +import org.maven.ide.eclipse.project.IMavenProjectFacade; +import org.maven.ide.eclipse.project.MavenProjectChangedEvent; +import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigura= tor; +import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequ= est; + +public class PortletProjectConfigurator extends AbstractProjectConfigurato= r { + + private static final String PORTLET_API_GROUP_ID =3D "javax.portlet"; //$= NON-NLS-1$ + private static final String PORTLET_API_ARTIFACT_ID =3D "portlet-api"; //= $NON-NLS-1$ + + private static final String PORTLETBRIDGE_API_GROUP_ID =3D "org.jboss.por= tletbridge"; //$NON-NLS-1$ + private static final String PORTLETBRIDGE_API_ARTIFACT_ID =3D "portletbri= dge-api"; //$NON-NLS-1$ + = + protected static final IProjectFacet dynamicWebFacet; + protected static final IProjectFacetVersion dynamicWebVersion; + = + protected static final IProjectFacet jsfFacet; + protected static final IProjectFacet portletFacet; + protected static final IProjectFacetVersion portletVersion10; + protected static final IProjectFacetVersion portletVersion20; + protected static final IProjectFacet m2Facet; + protected static final IProjectFacetVersion m2Version; + protected static final IProjectFacetVersion jsfportletFacetVersion; + = + static { + dynamicWebFacet =3D ProjectFacetsManager.getProjectFacet("jst.web"); //$= NON-NLS-1$ + dynamicWebVersion =3D dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$ + portletFacet =3D ProjectFacetsManager.getProjectFacet("jboss.portlet"); = //$NON-NLS-1$ + portletVersion20 =3D portletFacet.getVersion("2.0"); //$NON-NLS-1$ + portletVersion10 =3D portletFacet.getVersion("1.0"); //$NON-NLS-1$ + m2Facet =3D ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS= -1$ + m2Version =3D m2Facet.getVersion("1.0"); //$NON-NLS-1$ + jsfFacet =3D ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS= -1$ + jsfportletFacetVersion =3D ProjectFacetsManager.getProjectFacet("jboss.j= sfportlet").getVersion("1.0"); //$NON-NLS-1$//$NON-NLS-2$ + } + = + @Override + public void configure(ProjectConfigurationRequest request, + IProgressMonitor monitor) throws CoreException { + MavenProject mavenProject =3D request.getMavenProject(); + IProject project =3D request.getProject(); + configureInternal(mavenProject,project, monitor); + } + = + private void configureInternal(MavenProject mavenProject,IProject project, + IProgressMonitor monitor) throws CoreException { + IPreferenceStore store =3D MavenSeamActivator.getDefault().getPreference= Store(); + boolean configurePortlet =3D store.getBoolean(MavenSeamActivator.CONFIGU= RE_PORTLET); + if (!configurePortlet) { + return; + } + = + String packaging =3D mavenProject.getPackaging(); + String portletVersion =3D MavenSeamActivator.getDefault().getDependen= cyVersion(mavenProject, PORTLET_API_GROUP_ID, PORTLET_API_ARTIFACT_ID); + String jsfportletVersion =3D MavenSeamActivator.getDefault().getDepen= dencyVersion(mavenProject, PORTLETBRIDGE_API_GROUP_ID, PORTLETBRIDGE_API_AR= TIFACT_ID); + if (portletVersion !=3D null) { + final IFacetedProject fproj =3D ProjectFacetsManager.create(project); + if ("war".equals(packaging)) { //$NON-NLS-1$ + installWarFacets(fproj, portletVersion, jsfportletVersion, monitor); + } + } + } + + + @Override + protected void mavenProjectChanged(MavenProjectChangedEvent event, + IProgressMonitor monitor) throws CoreException { + IMavenProjectFacade facade =3D event.getMavenProject(); + if(facade !=3D null) { + IProject project =3D facade.getProject(); + if(isWTPProject(project)) { + MavenProject mavenProject =3D facade.getMavenProject(monitor); + configureInternal(mavenProject, project, monitor); + } + } + super.mavenProjectChanged(event, monitor); + } + + private boolean isWTPProject(IProject project) { + return ModuleCoreNature.getModuleCoreNature(project) !=3D null; + } + = + private void installM2Facet(IFacetedProject fproj, IProgressMonitor monit= or) throws CoreException { + if (!fproj.hasProjectFacet(m2Facet)) { + IDataModel config =3D (IDataModel) new MavenFacetInstallDataModelProvid= er().create(); + config.setBooleanProperty(IJBossMavenConstants.MAVEN_PROJECT_EXISTS, tr= ue); + fproj.installProjectFacet(m2Version, config, monitor); + } + } + + = + private void installWarFacets(IFacetedProject fproj, String portletVersio= n, String jsfportletVersion, IProgressMonitor monitor) throws CoreException= { + = + if (!fproj.hasProjectFacet(dynamicWebFacet)) { + MavenSeamActivator.log("The project doesn't contain the Web Module face= t."); + } + installM2Facet(fproj, monitor); + installPortletFacet(fproj, portletVersion, jsfportletVersion, monitor); + } + + + private void installPortletFacet(IFacetedProject fproj, String portletVer= sionString, String jsfportletVersion, IProgressMonitor monitor) + throws CoreException { + if (!fproj.hasProjectFacet(portletFacet)) { + if (portletVersionString.startsWith("1.0")) { //$NON-NLS-1$ + IDataModel model =3D createPortletDataModel(fproj, portletVersion10); + fproj.installProjectFacet(portletVersion10, model, monitor); = + } + if (portletVersionString.startsWith("2.0")) { //$NON-NLS-1$ + IDataModel model =3D createPortletDataModel(fproj, portletVersion20); + fproj.installProjectFacet(portletVersion20, model, monitor); = + } + } + IPreferenceStore store =3D MavenSeamActivator.getDefault().getPreference= Store(); + boolean configureJSFPortlet =3D store.getBoolean(MavenSeamActivator.CONF= IGURE_JSFPORTLET); + if (!configureJSFPortlet) { + return; + } + if (fproj.hasProjectFacet(portletFacet) && fproj.hasProjectFacet(jsfFace= t) && jsfportletVersion !=3D null) { + = + if (!fproj.hasProjectFacet(jsfportletFacetVersion)) { + IDataModel model =3D createJSFPortletDataModel(fproj, jsfportletFacetV= ersion); + fproj.installProjectFacet(jsfportletFacetVersion, model, monitor); + } + = + } + } + + private IDataModel createPortletDataModel(IFacetedProject fproj, IProject= FacetVersion facetVersion) { + IDataModel config =3D (IDataModel) new PortletFacetInstallDataModelProvi= der().create(); + LibraryInstallDelegate libraryDelegate =3D new LibraryInstallDelegate(fp= roj, facetVersion); + ILibraryProvider provider =3D LibraryProviderFramework.getProvider("port= let-no-op-library-provider"); //$NON-NLS-1$ + libraryDelegate.setLibraryProvider(provider); + config.setProperty(IPortletConstants.PORTLET_LIBRARY_PROVIDER_DELEGATE, = libraryDelegate); + return config; + } + = + private IDataModel createJSFPortletDataModel(IFacetedProject fproj, IProj= ectFacetVersion facetVersion) { + IDataModel config =3D (IDataModel) new JSFPortletFacetInstallDataModelPr= ovider().create(); + LibraryInstallDelegate libraryDelegate =3D new LibraryInstallDelegate(fp= roj, facetVersion); + ILibraryProvider provider =3D LibraryProviderFramework.getProvider("jsfp= ortlet-no-op-library-provider"); //$NON-NLS-1$ + libraryDelegate.setLibraryProvider(provider); + config.setProperty(IPortletConstants.JSFPORTLET_LIBRARY_PROVIDER_DELEGAT= E, libraryDelegate); + return config; + } +} Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tool= s/maven/seam/configurators/SeamProjectConfigurator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/configurators/SeamProjectConfigurator.java 2009-09-24 17:29:48 UTC (= rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/configurators/SeamProjectConfigurator.java 2009-09-24 20:48:08 UTC (= rev 17720) @@ -83,6 +83,10 @@ protected static final IProjectFacet m2Facet; protected static final IProjectFacetVersion m2Version; private static final IProjectFacet seamFacet; + private static final IProjectFacet portletFacet; + private static final IProjectFacet jsfportletFacet; + private static final IProjectFacet seamPortletFacet; + private static final IProjectFacetVersion seamPortletVersion; = static { seamFacet =3D ProjectFacetsManager.getProjectFacet("jst.seam"); //$NON-N= LS-1$ @@ -98,6 +102,10 @@ m2Version =3D m2Facet.getVersion("1.0"); //$NON-NLS-1$ ejbFacet =3D ProjectFacetsManager.getProjectFacet("jst.ejb"); //$NON-NLS= -1$ ejbVersion =3D ejbFacet.getVersion("3.0"); //$NON-NLS-1$ + portletFacet =3D ProjectFacetsManager.getProjectFacet("jboss.portlet"); = //$NON-NLS-1$ + jsfportletFacet =3D ProjectFacetsManager.getProjectFacet("jboss.jsfportl= et"); //$NON-NLS-1$ + seamPortletFacet =3D ProjectFacetsManager.getProjectFacet("jboss.seampor= tlet"); //$NON-NLS-1$ + seamPortletVersion =3D seamPortletFacet.getVersion("1.0"); //$NON-NLS-1$ } = @Override @@ -293,6 +301,16 @@ setModelProperty(model, prefs,ISeamFacetDataModelProperties.WEB_CONTEN= TS_FOLDER); } } + IPreferenceStore store =3D MavenSeamActivator.getDefault().getPreference= Store(); + boolean configureSeamPortlet =3D store.getBoolean(MavenSeamActivator.CON= FIGURE_SEAMPORTLET); + if (!configureSeamPortlet) { + return; + } + if (fproj.hasProjectFacet(seamFacet) && fproj.hasProjectFacet(portletFac= et) && fproj.hasProjectFacet(jsfportletFacet)) { + if (!fproj.hasProjectFacet(seamPortletFacet)) { + fproj.installProjectFacet(seamPortletVersion, null, monitor); + } + } } = private void setModelProperty(IDataModel model, IEclipsePreferences prefs= , String property) { @@ -305,7 +323,8 @@ private void installJSFFacet(IFacetedProject fproj, IProgressMonitor moni= tor) throws CoreException { if (!fproj.hasProjectFacet(jsfFacet)) { - fproj.installProjectFacet(jsfVersion, null, monitor); + IDataModel model =3D MavenSeamActivator.getDefault().createJSFDataModel= (fproj,jsfVersion); + fproj.installProjectFacet(jsfVersion, model, monitor); } } = Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tool= s/maven/seam/preferences/SeamConfiguratorPreferencePage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencePage.java 2009-09-24 17:29:48 = UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencePage.java 2009-09-24 20:48:08 = UTC (rev 17720) @@ -21,6 +21,9 @@ private Button configureSeamRuntimeButton; private Button configureSeamArtifactsButton; private Button configureJSFButton; + private Button configurePortletButton; + private Button configureJSFPortletButton; + private Button configureSeamPortletButton; = @Override protected Control createContents(Composite parent) { @@ -63,6 +66,21 @@ boolean configureJSF =3D store.getBoolean(MavenSeamActivator.CONFIGURE_J= SF); configureJSFButton.setSelection(configureJSF); = + configurePortletButton =3D new Button(composite,SWT.CHECK); + configurePortletButton.setText("Configure JBoss Portlet Core facet when = importing Maven projects"); + boolean configurePortlet =3D store.getBoolean(MavenSeamActivator.CONFIGU= RE_PORTLET); + configurePortletButton.setSelection(configurePortlet); + = + configureJSFPortletButton =3D new Button(composite,SWT.CHECK); + configureJSFPortletButton.setText("Configure JBoss JSF Portlet facet whe= n importing Maven projects"); + boolean configureJSFPortlet =3D store.getBoolean(MavenSeamActivator.CONF= IGURE_JSFPORTLET); + configureJSFPortletButton.setSelection(configureJSFPortlet); + = + configureSeamPortletButton =3D new Button(composite,SWT.CHECK); + configureSeamPortletButton.setText("Configure JBoss Seam Portlet facet w= hen importing Maven projects"); + boolean configureSeamPortlet =3D store.getBoolean(MavenSeamActivator.CON= FIGURE_SEAMPORTLET); + configureJSFPortletButton.setSelection(configureSeamPortlet); + = return composite; } = @@ -75,9 +93,15 @@ configureSeamButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_VALUE= ); configureSeamRuntimeButton.setSelection(MavenSeamActivator.CONFIGURE_SEA= M_RUNTIME_VALUE); configureSeamArtifactsButton.setSelection(MavenSeamActivator.CONFIGURE_S= EAM_ARTIFACTS_VALUE); + configurePortletButton.setSelection(MavenSeamActivator.CONFIGURE_PORTLET= _VALUE); + configureJSFPortletButton.setSelection(MavenSeamActivator.CONFIGURE_JSFP= ORTLET_VALUE); + configureSeamPortletButton.setSelection(MavenSeamActivator.CONFIGURE_SEA= MPORTLET_VALUE); IPreferenceStore store =3D MavenSeamActivator.getDefault().getPreference= Store(); store.setValue(MavenSeamActivator.CONFIGURE_SEAM, MavenSeamActivator.CON= FIGURE_SEAM_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_JSF, MavenSeamActivator.CONF= IGURE_JSF_VALUE); + store.setValue(MavenSeamActivator.CONFIGURE_JSFPORTLET, MavenSeamActivat= or.CONFIGURE_JSFPORTLET_VALUE); + store.setValue(MavenSeamActivator.CONFIGURE_SEAMPORTLET, MavenSeamActiva= tor.CONFIGURE_SEAMPORTLET_VALUE); + store.setValue(MavenSeamActivator.CONFIGURE_PORTLET, MavenSeamActivator.= CONFIGURE_PORTLET_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, MavenSeamActiv= ator.CONFIGURE_SEAM_RUNTIME_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, MavenSeamAct= ivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); configureSeamRuntimeButton.setEnabled(configureSeamButton.getSelection()= ); @@ -89,7 +113,10 @@ public boolean performOk() { IPreferenceStore store =3D MavenSeamActivator.getDefault().getPreference= Store(); store.setValue(MavenSeamActivator.CONFIGURE_SEAM, configureSeamButton.ge= tSelection()); + store.setValue(MavenSeamActivator.CONFIGURE_PORTLET, configurePortletBut= ton.getSelection()); store.setValue(MavenSeamActivator.CONFIGURE_JSF, configureJSFButton.getS= election()); + store.setValue(MavenSeamActivator.CONFIGURE_JSFPORTLET, configureJSFPort= letButton.getSelection()); + store.setValue(MavenSeamActivator.CONFIGURE_SEAMPORTLET, configureSeamPo= rtletButton.getSelection()); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, configureSeamR= untimeButton.getSelection()); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, configureSea= mArtifactsButton.getSelection()); return super.performOk(); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tool= s/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-09-24 1= 7:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/mave= n/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-09-24 2= 0:48:08 UTC (rev 17720) @@ -25,6 +25,15 @@ node.putBoolean( MavenSeamActivator.CONFIGURE_JSF, MavenSeamActivator.CONFIGURE_JSF_VALUE); + node.putBoolean( + MavenSeamActivator.CONFIGURE_PORTLET, + MavenSeamActivator.CONFIGURE_PORTLET_VALUE); + node.putBoolean( + MavenSeamActivator.CONFIGURE_JSFPORTLET, + MavenSeamActivator.CONFIGURE_JSFPORTLET_VALUE); + node.putBoolean( + MavenSeamActivator.CONFIGURE_SEAMPORTLET, + MavenSeamActivator.CONFIGURE_SEAMPORTLET_VALUE); } = } --===============8164843192245679117==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 20:39:53 2009 Content-Type: multipart/mixed; boundary="===============7304235066075171974==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17721 - trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide. Date: Thu, 24 Sep 2009 20:39:53 -0400 Message-ID: <200909250039.n8P0drqE029479@svn01.web.mwc.hst.phx2.redhat.com> --===============7304235066075171974== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-24 20:39:53 -0400 (Thu, 24 Sep 2009) New Revision: 17721 Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css= /test/jbide/InputFractionalValueTest_JBIDE4790.java Log: fix tests compilation errors Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/= jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-24 20:48:08 UT= C (rev 17720) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/cs= s/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-25 00:39:53 UT= C (rev 17721) @@ -82,7 +82,7 @@ StyleAttributes styleAttributes =3D page.getStyleAttributes(); = assertEquals(testedValue, styleAttributes - .getAttribute(TEST_CSS_ATTRIBUTE_NAME)); + .get(TEST_CSS_ATTRIBUTE_NAME)); = String[] parsedTestValue =3D Util.convertExtString(testedValue); = @@ -90,7 +90,7 @@ = String newTestedValue =3D parsedTestValue[0] + "." + parsedTestValue[1];= //$NON-NLS-1$ = - styleAttributes.getAttributeMap().put(TEST_CSS_ATTRIBUTE_NAME, + styleAttributes.put(TEST_CSS_ATTRIBUTE_NAME, newTestedValue); = testedValue =3D declaration.getPropertyValue(TEST_CSS_ATTRIBUTE_NAME); @@ -107,7 +107,7 @@ newTestedValue =3D parsedTestValue[0] + "3" + parsedTestValue[1]; //$NON= -NLS-1$ = try { - styleAttributes.getAttributeMap().put(TEST_CSS_ATTRIBUTE_NAME, + styleAttributes.put(TEST_CSS_ATTRIBUTE_NAME, newTestedValue); = } catch (DOMException e) { --===============7304235066075171974==-- From jbosstools-commits at lists.jboss.org Thu Sep 24 21:20:05 2009 Content-Type: multipart/mixed; boundary="===============4583570189087151695==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17722 - in trunk: jsf/features/org.jboss.tools.richfaces.feature and 15 other directories. Date: Thu, 24 Sep 2009 21:20:05 -0400 Message-ID: <200909250120.n8P1K5B6003620@svn01.web.mwc.hst.phx2.redhat.com> --===============4583570189087151695== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-24 21:20:03 -0400 (Thu, 24 Sep 2009) New Revision: 17722 Removed: trunk/jsf/plugins/org.jboss.tools.jsf/meta/ Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jbo= ss/tools/common/projecttemplates/ProjectTemplatesPlugin.java trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf/build.properties trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/ca= pabilities/JSFCapabilitiesLoader.java trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web/build.properties trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3628 - Plugins should be .jar's no= t directories for efficiency sake to make Plug-ins were converted to jars: jsf jsf.ui jst.web jst.web.ui jst.web.tiles jst.web.tiles.ui jst.jsp common.projecttemplates Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/= org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jb= oss/tools/common/projecttemplates/ProjectTemplatesPlugin.java 2009-09-25 00= :39:53 UTC (rev 17721) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jb= oss/tools/common/projecttemplates/ProjectTemplatesPlugin.java 2009-09-25 01= :20:03 UTC (rev 17722) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.common.zip.UnzipOperation; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; = @@ -45,34 +46,28 @@ copyProjectTemplates(); } = - public static String getInstallPath() { + + void copyProjectTemplates() throws IOException { Bundle bundle =3D Platform.getBundle(PLUGIN_ID); - URL url =3D null; - try { - url =3D bundle =3D=3D null ? null : FileLocator.resolve(bundle.getEntry= ("/")); //$NON-NLS-1$ - } catch (IOException e) { - url =3D bundle.getEntry("/"); //$NON-NLS-1$ + File location =3D Platform.getStateLocation(bundle).toFile(); + File install =3D FileLocator.getBundleFile(bundle); = + if(install.isDirectory()) { + FileFilter filter =3D new FileFilter() { + public boolean accept(File pathname) { + return pathname !=3D null = + && !"CVS".equals(pathname.getName()) //$NON-NLS-1$ + && !".svn".equalsIgnoreCase(pathname.getName()); //$NON-NLS-1$ + } + }; + copy(location, install, "templates", filter); //$NON-NLS-1$ + copy(location, install, "lib", filter); //$NON-NLS-1$ + } else { + UnzipOperation unzip =3D new UnzipOperation(install); + unzip.execute(location, "templates"); + unzip.execute(location, "lib"); } - return (url =3D=3D null) ? null : url.getPath(); } = - - void copyProjectTemplates() { - Bundle b =3D Platform.getBundle(PLUGIN_ID); - File location =3D Platform.getStateLocation(b).toFile(); - File install =3D new File(getInstallPath()); - if(!install.isDirectory()) return; - FileFilter filter =3D new FileFilter() { - public boolean accept(File pathname) { - return pathname !=3D null = - && !"CVS".equals(pathname.getName()) //$NON-NLS-1$ - && !".svn".equalsIgnoreCase(pathname.getName()); //$NON-NLS-1$ - } - }; - copy(location, install, "templates", filter); //$NON-NLS-1$ - copy(location, install, "lib", filter); //$NON-NLS-1$ - } - = private void copy(File location, File install, String name, FileFilter fi= lter) { location =3D new File(location, name); //if(location.isDirectory()) return; @@ -95,5 +90,4 @@ static public void log(Exception ex) { getDefault().getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK,= "No message", ex)); //$NON-NLS-1$ } - = } \ No newline at end of file Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-0= 9-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-0= 9-25 01:20:03 UTC (rev 17722) @@ -1,322 +1,330 @@ - - - - - %description - - - - %copyright - - - + + + + + %description + + + + %copyright + + + Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, the GNU Lesser General Public License, and/or certain other open source licenses. For precise licensing details, consult the corresponding source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, -Raleigh NC 27606 USA. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Raleigh NC 27606 USA. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2009-09-25 0= 0:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2009-09-25 0= 1:20:03 UTC (rev 17722) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName -Bundle-ClassPath: jsf.jar Bundle-Activator: org.jboss.tools.jsf.JSFModelPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jsf/plugins/org.jboss.tools.jsf/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2009-09-25 00:39= :53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2009-09-25 01:20= :03 UTC (rev 17722) @@ -1,10 +1,11 @@ -source.jsf.jar =3D src/,\ - resources/ bin.includes =3D plugin.xml,\ META-INF/,\ plugin.properties,\ about.html,\ dtds/,\ - jsf.jar,\ - images/ -jars.compile.order =3D jsf.jar + images/,\ + . +jars.compile.order =3D . +output.. =3D bin/ +source.. =3D src/,\ + resources/ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-25 00:39:53 UT= C (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-25 01:20:03 UT= C (rev 17722) @@ -419,7 +419,7 @@ + uri=3D"platform:/plugin/org.jboss.tools.jsf/dtds/facelet-taglib_= 1_0.dtd"/> = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/pro= ject/capabilities/JSFCapabilitiesLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/c= apabilities/JSFCapabilitiesLoader.java 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/c= apabilities/JSFCapabilitiesLoader.java 2009-09-25 01:20:03 UTC (rev 17722) @@ -12,6 +12,7 @@ = import java.io.File; = +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.osgi.framework.Bundle; = @@ -39,8 +40,8 @@ String fileLocation =3D stateLocation + "/templates/JSFCapabilities.xml"; File f =3D new File(fileLocation); if(!f.exists()) { - String install =3D ProjectTemplatesPlugin.getInstallPath(); - File source =3D new File(install, "templates/JSFCapabilities.xml"); + IPath install =3D ProjectTemplatesPlugin.getTemplateStatePath(); + File source =3D new File(install.toFile(), "templates/JSFCapabilities.x= ml"); FileUtil.copyFile(source, f, true); } return f; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-09-2= 5 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-09-2= 5 01:20:03 UTC (rev 17722) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName -Bundle-ClassPath: jsfui.jar Bundle-Activator: org.jboss.tools.jsf.ui.JsfUiPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties 2009-09-25 00= :39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties 2009-09-25 01= :20:03 UTC (rev 17722) @@ -3,7 +3,10 @@ plugin.properties,\ images/,\ about.html,\ - META-INF/ -source.jsfui.jar =3D src/,\ - resources/ -jars.compile.order =3D jsfui.jar + META-INF/,\ + . +jars.compile.order =3D jsfui.jar,\ + . +output.. =3D bin/ +source.. =3D src/,\ + resources/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-= 25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-= 25 01:20:03 UTC (rev 17722) @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: jspeditor.jar Bundle-Activator: org.jboss.tools.jst.jsp.JspEditorPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2009-09-25 0= 0:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2009-09-25 0= 1:20:03 UTC (rev 17722) @@ -1,10 +1,12 @@ -source.jspeditor.jar =3D src/,\ - resources/ bin.includes =3D templates/,\ plugin.xml,\ plugin.properties,\ images/,\ about.html,\ META-INF/,\ - jspeditor.jar + . src.includes =3D resources/ +jars.compile.order =3D . +output.. =3D bin/ +source.. =3D resources/,\ + src/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-25 00:39:5= 3 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-25 01:20:0= 3 UTC (rev 17722) @@ -124,7 +124,7 @@ = - + + uri=3D"platform:/plugin/org.jboss.tools.jst.web/catalog/ja= vaee_5.xsd" /> = Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 20= 09-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 20= 09-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: web-tiles.jar +Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.tiles;singleton:=3Dtrue Bundle-Localization: plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties 2009-0= 9-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties 2009-0= 9-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,10 @@ -jars.compile.order =3D web-tiles.jar -source.web-tiles.jar =3D src/,\ - resources/ -output.web-tiles.jar =3D /bin +jars.compile.order =3D . +source.. =3D src/,\ + resources/ +output.. =3D /bin src.includes =3D src/,\ resources/ -bin.includes =3D web-tiles.jar,\ +bin.includes =3D .,\ plugin.xml,\ plugin.properties,\ dtds/,\ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2009-09-25 0= 0:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2009-09-25 0= 1:20:03 UTC (rev 17722) @@ -88,8 +88,8 @@ + uri=3D"platform:/plugin/org.jboss.tools.jst.web.tiles/dtds/tiles= _config_1_1.dtd"/> = - \ No newline at end of file + Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIF= EST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF= 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF= 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName -Bundle-ClassPath: tilesui.jar +Bundle-ClassPath: . Bundle-Activator: org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.tiles.ui;singleton:=3Dtrue Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properti= es =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties 200= 9-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties 200= 9-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,10 @@ -jars.compile.order =3D tilesui.jar -source.tilesui.jar =3D src/,\ - resources/ -output.tilesui.jar =3D /bin +jars.compile.order =3D . +source.. =3D src/,\ + resources/ +output.. =3D /bin src.includes =3D src/,\ resources/ -bin.includes =3D tilesui.jar,\ +bin.includes =3D .,\ plugin.xml,\ plugin.properties,\ images/,\ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml 2009-09-2= 5 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml 2009-09-2= 5 01:20:03 UTC (rev 17722) @@ -4,7 +4,7 @@ = - + @@ -44,7 +44,7 @@ - + Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2009-= 09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2009-= 09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,6 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: webui.jar Bundle-Activator: org.jboss.tools.jst.web.ui.WebUiPlugin Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.ui;singleton:=3Dtrue Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties 2009-09-2= 5 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties 2009-09-2= 5 01:20:03 UTC (rev 17722) @@ -1,7 +1,9 @@ -source.webui.jar =3D src/ bin.includes =3D plugin.xml,\ plugin.properties,\ images/,\ about.html,\ META-INF/,\ - webui.jar + . +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-09-25 00:3= 9:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-09-25 01:2= 0:03 UTC (rev 17722) @@ -30,10 +30,10 @@ class=3D"org.jboss.tools.jst.web.ui.editors.WebCompoundEditor" = contributorClass=3D"org.jboss.tools.common.model.ui.texteditors.M= ultiPageContributor" = entities=3D"FileWebApp,FileWebApp24,FileWebApp25" = - icon=3D"images/xstudio/editors/webapp_file.gif" = + icon=3D"$nl$/images/xstudio/editors/webapp_file.gif" = name=3D"%editors.web.name"> - + @@ -44,7 +44,7 @@ @@ -52,7 +52,7 @@ @@ -95,7 +95,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFile= Wizard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_css_file.gif" + icon=3D"$nl$/images/xstudio/wizards/new_css_file.gif" id=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWiz= ard" name=3D"%NewWizard_CSSFile" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -110,7 +110,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.jst.web.ui.wizards.css.NewCSSClassWiz= ard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_css_class.gif" + icon=3D"$nl$/images/xstudio/wizards/new_css_class.gif" id=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSClassWi= zard" name=3D"%NewWizard_CSSClass" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -125,7 +125,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileW= izard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_js_file.gif" + icon=3D"$nl$/images/xstudio/wizards/new_js_file.gif" id=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWiza= rd" name=3D"%NewWizard_JSFile" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -140,7 +140,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFile= Wizard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_webapp_file.gif" + icon=3D"$nl$/images/xstudio/wizards/new_webapp_file.gif" id=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFileWiz= ard" name=3D"%NewWizard_WebDescriptor" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -155,7 +155,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.common.model.ui.wizard.newfile.NewJSP= FileWizard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_jsp_file.gif" + icon=3D"$nl$/images/xstudio/wizards/new_jsp_file.gif" id=3D"org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFil= eWizard" name=3D"%NewWizard_JSPFile" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -170,7 +170,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.common.model.ui.wizard.newfile.NewXHT= MLFileWizard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_html_file.gif" + icon=3D"$nl$/images/xstudio/wizards/new_html_file.gif" id=3D"org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLF= ileWizard" name=3D"%NewWizard_XHTMLFile" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -185,7 +185,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.common.model.ui.wizard.newfile.NewHTM= LFileWizard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_html_file.gif" + icon=3D"$nl$/images/xstudio/wizards/new_html_file.gif" id=3D"org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFi= leWizard" name=3D"%NewWizard_HTMLFile" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -199,7 +199,7 @@ @@ -213,7 +213,7 @@ category=3D"org.jboss.tools.jst.web" class=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFile= Wizard" finalPerspective=3D"org.jboss.tools.jst.web.ui.WebDevelopmentP= erspective" - icon=3D"images/xstudio/wizards/new_taglibs_file.gif" + icon=3D"$nl$/images/xstudio/wizards/new_taglibs_file.gif" id=3D"org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWiz= ard" name=3D"%NewWizard_TLDFile" preferredPerspectives=3D"org.jboss.tools.jst.web.ui.WebDevelop= mentPerspective" @@ -229,9 +229,9 @@ - + - + = @@ -309,7 +309,7 @@ = - + = @@ -436,7 +436,7 @@ --===============6151049275498318551== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-25 01:49:39 -0400 (Fri, 25 Sep 2009) New Revision: 17723 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/wizards/NewConfigurationWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4917 Hibernate Configuration File = (cfg.xml) wizard doesn't initialize 'Driver Class' and 'Connection URL' acc= ording to default value 'DB2' selected in "Database Dialect' field fixed by removing = combo.select(0); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/wizards/NewConfigurationWizardPage.java 2009-09-25 01= :20:03 UTC (rev 17722) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/wizards/NewConfigurationWizardPage.java 2009-09-25 05= :49:39 UTC (rev 17723) @@ -148,7 +148,6 @@ label.setText(HibernateConsoleMessages.NewConfigurationWizardPage_= database_dialect); dialectCombo =3D new Combo(container, SWT.NULL); fillHerUp(dialectCombo, helper.getDialectNames() ); - dialectCombo.select(0); gd =3D new GridData(GridData.FILL_HORIZONTAL); gd.grabExcessHorizontalSpace =3D true; dialectCombo.setLayoutData(gd); --===============6151049275498318551==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 03:38:06 2009 Content-Type: multipart/mixed; boundary="===============3682501406183417730==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17724 - in trunk: bpel/features/org.jboss.tools.bpel.feature and 19 other directories. Date: Fri, 25 Sep 2009 03:38:06 -0400 Message-ID: <200909250738.n8P7c674013096@svn01.web.mwc.hst.phx2.redhat.com> --===============3682501406183417730== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2009-09-25 03:38:05 -0400 (Fri, 25 Sep 2009) New Revision: 17724 Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.x= ml trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MAN= IFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.proper= ties trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/commo= n/ui/CommonUIPlugin.java trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.model/build.properties trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties trunk/common/plugins/org.jboss.tools.common.gef/build.properties Log: https://jira.jboss.org/jira/browse/JBIDE-3628 - Plugins should be .jar's no= t directories for efficiency sake to make Plug-ins were converted to jars: some bpel plug-ins converted to jars Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/fe= ature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.= xml 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.= xml 2009-09-25 07:38:05 UTC (rev 17724) @@ -14,7 +14,8 @@ %copyright = - Red Hat, Inc. licenses these features and plugins to you under + + Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which = in a particular case may include the Eclipse Public License, the GNU = Lesser General Public License, and/or certain other open source = @@ -47,7 +48,8 @@ id=3D"org.jboss.ide.eclipse.archives.core" download-size=3D"0" install-size=3D"0" - version=3D"0.0.0"/> + version=3D"0.0.0" + unpack=3D"false"/> = - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-= INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MA= NIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MA= NIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,6 @@ Bundle-Name: ODE Deploy Descriptor EMF Model Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:= =3Dtrue Bundle-Version: 0.4.0.qualifier -Bundle-ClassPath: . Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build= .properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.prope= rties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.prope= rties 2009-09-25 07:38:05 UTC (rev 17724) @@ -4,12 +4,10 @@ # # $Id: build.properties,v 1.2 2008/11/08 13:59:16 smoser Exp $ = -bin.includes =3D .,\ - model/,\ +bin.includes =3D model/,\ META-INF/,\ plugin.xml,\ - plugin.properties,\ - bin/ + plugin.properties jars.compile.order =3D . -source.. =3D src/ output.. =3D bin/ +source.. =3D src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.pr= operties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properti= es 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properti= es 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,5 +3,4 @@ bin.includes =3D plugin.xml,\ META-INF/,\ .,\ - icons/,\ - bin/ + icons/ Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.prop= erties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties= 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties= 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,6 @@ bin.includes =3D META-INF/,\ .,\ plugin.xml,\ - bin/,\ definition/,\ icons/,\ plugin.properties Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFES= T.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2= 009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2= 009-09-25 07:38:05 UTC (rev 17724) @@ -57,5 +57,4 @@ org.eclipse.emf.ecore.xmi.util", org.eclipse.bpel.names Bundle-Vendor: eclipse.org -Bundle-ClassPath: bin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties 2009-= 09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties 2009-= 09-25 07:38:05 UTC (rev 17724) @@ -1,27 +1,17 @@ -##########################################################################= ##### -# Copyright (c) 2005 IBM Corporation 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: -# IBM Corporation - initial API and implementation -##########################################################################= ##### -bin.includes =3D META-INF/,\ - plugin.xml,\ - plugin.properties,\ - bin/,\ - bin -src.includes =3D .classpath,\ - .cvsignore,\ - .project,\ - META-INF/,\ - bin/,\ - build.properties,\ - plugin.properties,\ - src/,\ - plugin.xml -output.code.jar =3D bin/ -jars.compile.order =3D code.jar -source.bin =3D src/ +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ +bin.includes =3D META-INF/,\ + plugin.properties,\ + plugin.xml,\ + schema/,\ + . +src.includes =3D .project,\ + .cvsignore,\ + .classpath,\ + META-INF/,\ + build.properties,\ + plugin.properties,\ + plugin.xml,\ + schema/,\ + src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009= -09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009= -09-25 07:38:05 UTC (rev 17724) @@ -31,4 +31,3 @@ org.eclipse.bpel.common.ui.tray Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: eclipse.org -Bundle-ClassPath: bin Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties 2009-09-= 25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties 2009-09-= 25 07:38:05 UTC (rev 17724) @@ -12,17 +12,17 @@ plugin.xml,\ schema/,\ icons/,\ - bin/ + . src.includes =3D .classpath,\ .cvsignore,\ .project,\ META-INF/,\ - bin/,\ build.properties,\ icons/,\ plugin.xml,\ schema/,\ src/ output.code.jar =3D bin/ -jars.compile.order =3D code.jar -source.bin =3D src/ = +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpe= l/common/ui/CommonUIPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/comm= on/ui/CommonUIPlugin.java 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/comm= on/ui/CommonUIPlugin.java 2009-09-25 07:38:05 UTC (rev 17724) @@ -125,6 +125,7 @@ try { url =3D new URL(baseURL, ICommonUIConstants.ICON_PATH + id); } catch (MalformedURLException e) { + log(e); } ImageDescriptor desc =3D ImageDescriptor.createFromURL(url); getImageRegistry().put(id, desc); Modified: trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-09-= 25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-09-= 25 07:38:05 UTC (rev 17724) @@ -30,4 +30,3 @@ org.eclipse.bpel.model.terms, org.eclipse.bpel.model.util Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: bin Modified: trunk/bpel/plugins/org.eclipse.bpel.model/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2009-09-25 0= 5:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2009-09-25 0= 7:38:05 UTC (rev 17724) @@ -11,8 +11,7 @@ bin.includes =3D META-INF/,\ plugin.xml,\ plugin.properties,\ - bin/,\ - bin + . src.includes =3D .classpath,\ .cvsignore,\ .project,\ @@ -23,4 +22,4 @@ plugin.xml,\ src/ jars.compile.order =3D = -source.bin =3D src/ +source.. =3D src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-= 09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-= 09-25 07:38:05 UTC (rev 17724) @@ -29,6 +29,5 @@ org.eclipse.bpel.runtimes.module, org.eclipse.bpel.runtimes.publishers, org.eclipse.bpel.runtimes.ui.wizards -Bundle-ClassPath: bin Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties 2009-09-2= 5 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties 2009-09-2= 5 07:38:05 UTC (rev 17724) @@ -3,7 +3,7 @@ icons/,\ plugin.properties,\ bin/,\ - bin + . = jars.compile.order =3D = src.includes =3D META-INF/,\ @@ -16,5 +16,5 @@ .project,\ .cvsignore,\ .classpath -source.bin =3D src/ +source.. =3D src/ = Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath 2009-09-25 05:= 49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath 2009-09-25 07:= 38:05 UTC (rev 17724) @@ -1,9 +1,7 @@ - - - - - - - - - + + + + + + + Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009= -09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009= -09-25 07:38:05 UTC (rev 17724) @@ -20,8 +20,7 @@ javax.wsdl;bundle-version=3D"[1.5.0,1.6.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: bin, - meta/ +Bundle-ClassPath: bpel-validator.jar Export-Package: org.eclipse.bpel.validator, org.eclipse.bpel.validator.adapters, org.eclipse.bpel.validator.factory, Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2009-09-= 25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2009-09-= 25 07:38:05 UTC (rev 17724) @@ -5,12 +5,10 @@ *.xml,\ intro/,\ schema/,\ - lib/,\ - bin/,\ - meta/,\ + .,\ src-exclude.xsl jars.compile.order =3D code.jar,\ - bin/ + bpel-validator.jar src.includes =3D .classpath,\ .project,\ .settings/,\ @@ -20,22 +18,19 @@ html/,\ icons/,\ intro/,\ - lib/,\ monkey/,\ plugin.xml,\ src/,\ testToc.xml,\ toc.xml,\ schema/,\ - tests/,\ - bin-jaxen/,\ meta/,\ - validatorBuild.xml,\ src-exclude.xsl,\ customBuildCallbacks.xml output.code.jar =3D bin/ -source.bin/ =3D src/ -output.bin/ =3D bin/ +source.bpel-validator.jar =3D src/,\ + meta/ +output.bpel-validator.jar =3D bin/ # customBuildCallbacks=3DcustomBuildCallbacks.xml # Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath 2009-09-25 05:49= :39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath 2009-09-25 07:38= :05 UTC (rev 17724) @@ -3,7 +3,6 @@ - Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-0= 9-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-0= 9-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,7 @@ Bundle-Name: XPath Parser 1.0 (Incubation) Bundle-SymbolicName: org.eclipse.bpel.xpath10 Bundle-Version: 0.4.0.qualifier -Bundle-ClassPath: ., bin/, +Bundle-ClassPath: ., lib/antlr-runtime-3.0.1.jar Export-Package: org.antlr.runtime;uses:=3D"org.antlr.runtime.tree", org.antlr.runtime.debug;uses:=3D"org.antlr.runtime.tree,org.antlr.runtime= ", Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-09-25= 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-09-25= 07:38:05 UTC (rev 17724) @@ -1,6 +1,5 @@ bin.includes =3D META-INF/,\ lib/,\ - bin/,\ . src.includes =3D .classpath,\ .project,\ Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properti= es =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties 200= 9-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties 200= 9-09-25 07:38:05 UTC (rev 17724) @@ -1,4 +1,6 @@ source.. =3D src/ output.. =3D bin/ bin.includes =3D META-INF/,\ - . + .,\ + cheatsheets/,\ + plugin.xml Modified: trunk/common/plugins/org.jboss.tools.common.gef/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.gef/build.properties 2009-0= 9-25 05:49:39 UTC (rev 17723) +++ trunk/common/plugins/org.jboss.tools.common.gef/build.properties 2009-0= 9-25 07:38:05 UTC (rev 17724) @@ -1,8 +1,7 @@ -bin.includes =3D plugin.xml,\ - *.jar,\ - .,\ +bin.includes =3D .,\ META-INF/,\ - plugin.properties + plugin.properties,\ + about.html source.. =3D resources/,\ src/ jars.compile.order =3D . --===============3682501406183417730==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 04:17:29 2009 Content-Type: multipart/mixed; boundary="===============3731211370012503735==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17725 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: preferences and 1 other directory. Date: Fri, 25 Sep 2009 04:17:29 -0400 Message-ID: <200909250817.n8P8HT4Y021033@svn01.web.mwc.hst.phx2.redhat.com> --===============3731211370012503735== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2009-09-25 04:17:28 -0400 (Fri, 25 Sep 2009) New Revision: 17725 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.= java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.= properties trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferenc= es/WSILPreferencePage.java Log: JBIDE-4910: BPEL->'WSIL Browser' Preference page cannot load WSIL xml Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Me= ssages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages= .java 2009-09-25 07:38:05 UTC (rev 17724) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages= .java 2009-09-25 08:17:28 UTC (rev 17725) @@ -225,6 +225,7 @@ public static String BPELPreferencePage_WSIL_MoveUp; public static String BPELPreferencePage_WSIL_OpenInBrowser; public static String BPELPreferencePage_WSIL_DocumentNotLoaded; + public static String BPELPreferencePage_WSIL_NameLimit; public static String BPELPreferencePage_WSIL_EnterLocation; public static String BPELPreferencePage_WSIL_EnterDescription; public static String BPELUIRegistry_Expression_language_editors_must_prov= ide_expressionLanguage_and_class__8; Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/me= ssages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages= .properties 2009-09-25 07:38:05 UTC (rev 17724) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages= .properties 2009-09-25 08:17:28 UTC (rev 17725) @@ -119,6 +119,7 @@ BPELPreferencePage_WSIL_Remove =3D Remove BPELPreferencePage_WSIL_Index =3D # BPELPreferencePage_WSIL_DocumentNotLoaded =3D WSIL Document not loaded. +BPELPreferencePage_WSIL_NameLimit =3D WSIL Document's name should be ended= with .wsil BPELPreferencePage_WSIL_MoveDown =3D Move Down BPELPreferencePage_WSIL_MoveUp =3D Move Up BPELPreferencePage_WSIL_OpenInBrowser =3D Open in Browser Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/pr= eferences/WSILPreferencePage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferen= ces/WSILPreferencePage.java 2009-09-25 07:38:05 UTC (rev 17724) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferen= ces/WSILPreferencePage.java 2009-09-25 08:17:28 UTC (rev 17725) @@ -102,6 +102,8 @@ Button moveDownButton; Button openInBrowserButton; = + private static String WSIL =3D "wsil"; + = // Track the modification of any element in the WSIL model. // we don't use commands and stacks here. EContentAdapter fContentAdapter =3D new EContentAdapter() { @@ -177,6 +179,7 @@ @Override public void widgetSelected(SelectionEvent e) { FileDialog fd =3D new FileDialog(getShell(), SWT.OPEN); + fd.setFilterExtensions(new String[]{"*."+WSIL}); String fileName =3D fd.open(); if ((fileName !=3D null) && (fileName.length() > 0)) { // parse to file url @@ -500,6 +503,10 @@ if (url.length() < 1) { return ; } + if(!url.endsWith(WSIL)){ + setMessage(Messages.BPELPreferencePage_WSIL_NameLimit, ERROR); + return; + } = if (fWsilDocument !=3D null) { fWsilDocument.eResource().eAdapters().remove( fContentAdapter ); @@ -511,7 +518,7 @@ Resource resource =3D null; try { = - resource =3D resourceSet.getResource(uri, true, "wsil"); + resource =3D resourceSet.getResource(uri, true, WSIL); = List contents =3D resource.getContents(); = --===============3731211370012503735==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 07:34:43 2009 Content-Type: multipart/mixed; boundary="===============4599230394317461286==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17726 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: mozilla and 1 other directories. Date: Fri, 25 Sep 2009 07:34:43 -0400 Message-ID: <200909251134.n8PBYhDH022891@svn01.web.mwc.hst.phx2.redhat.com> --===============4599230394317461286== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2009-09-25 07:34:43 -0400 (Fri, 25 Sep 2009) New Revision: 17726 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= EditorPart.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl= /CustomSashForm.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl= /SashSetting.java Log: https://jira.jboss.org/jira/browse/JBIDE-4935, editors flipping was fixed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeEditorPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eEditorPart.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -546,13 +546,15 @@ * Editors orientation is based on preference's settings. */ container =3D new CustomSashForm(cmpEd, CustomSashForm - .getSplittingFromPreferences()); + .getSplittingDirection(JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))); if (editorSettings !=3D null) { editorSettings.addSetting(new SashSetting(container)); } = container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(JspEditorPlugin.getDefault().getP= referenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))) { sourceContent =3D new Composite(container, SWT.NONE); visualContent =3D new Composite(container, SWT.NONE); } else { @@ -687,7 +689,7 @@ listener =3D new XModelTreeListener() { = public void nodeChanged(XModelTreeEvent event) { - fillContainer(); + fillContainer(false, null); selectionBar.setVisible(selectionBar.getAlwaysVisibleOption()); } = @@ -762,7 +764,16 @@ }; } = - public void fillContainer() { + /** + * Re-fills the VPE container according to new settings. + * = + * @param useCurrentEditorSettings + * if true VPE will hold its current state = + * otherwise values from preference page will be used, + * @param currentOrientation + * current source-visual editors splitting value + */ + public void fillContainer(boolean useCurrentEditorSettings, String curren= tOrientation) { /* * https://jira.jboss.org/jira/browse/JBIDE-4152 * = @@ -772,9 +783,15 @@ * = * Content should be added to a new container. */ + String splitting; + if (useCurrentEditorSettings) { + splitting =3D currentOrientation; + } else { + splitting =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + } CustomSashForm newContainer =3D new CustomSashForm(cmpEd, CustomSashForm - .getSplittingFromPreferences()); - newContainer.setOrientation(CustomSashForm.getSplittingFromPreferences()= ); + .getSplittingDirection(splitting)); = /* * Reset editor's settings. = @@ -784,18 +801,13 @@ editorSettings.addSetting(new SashSetting(newContainer)); } newContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - = - /* - * Read stored preference settings. = - * Correct layout by selecting the order of components adding. - * All three editors should be added to the new container. - */ - if (CustomSashForm.isSourceEditorFirst()) { - sourceContent.setParent(newContainer); - visualContent.setParent(newContainer); + + if (CustomSashForm.isSourceEditorFirst(splitting)) { + sourceContent.setParent(newContainer); + visualContent.setParent(newContainer); } else { - visualContent.setParent(newContainer); - sourceContent.setParent(newContainer); + visualContent.setParent(newContainer); + sourceContent.setParent(newContainer); } previewContent.setParent(newContainer); = @@ -825,29 +837,33 @@ int defaultWeight =3D JspEditorPlugin.getDefault().getPreferenceStore() .getInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS); int[] weights =3D container.getWeights(); - if (defaultWeight =3D=3D 0) { - if (CustomSashForm.isSourceEditorFirst()) { - container.maxDown(); - } else { - container.maxUp(); - } - } else if (defaultWeight =3D=3D 1000) { - if (CustomSashForm.isSourceEditorFirst()) { - container.maxUp(); - } else { - container.maxDown(); - } + if (useCurrentEditorSettings) { + newContainer.setWeights(weights); } else { - if (CustomSashForm.isSourceEditorFirst()) { - weights[0] =3D 1000 - defaultWeight; - weights[1] =3D defaultWeight; + if (defaultWeight =3D=3D 0) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { + container.maxDown(); + } else { + container.maxUp(); + } + } else if (defaultWeight =3D=3D 1000) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { + container.maxUp(); + } else { + container.maxDown(); + } } else { - weights[0] =3D defaultWeight; - weights[1] =3D 1000 - defaultWeight; + if (CustomSashForm.isSourceEditorFirst(splitting)) { + weights[0] =3D 1000 - defaultWeight; + weights[1] =3D defaultWeight; + } else { + weights[0] =3D defaultWeight; + weights[1] =3D 1000 - defaultWeight; + } + if ((weights !=3D null) && !container.isDisposed()){ + container.setWeights(weights); + } } - if ((weights !=3D null) && !container.isDisposed()){ - container.setWeights(weights); - } } = container.setSashBorders(new boolean[] { true, true, true }); @@ -1118,7 +1134,8 @@ = public void maximizeSource() { if (container !=3D null) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(JspEditorPlugin.getDefault().get= PreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))) { container.maxDown(); } else { container.maxUp(); @@ -1134,7 +1151,8 @@ = public void maximizeVisual() { if (container !=3D null) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(JspEditorPlugin.getDefault().get= PreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))) { container.maxUp(); } else { container.maxDown(); @@ -1178,7 +1196,7 @@ */ if (getController() !=3D null) { selectionBar.setVisible(selectionBar.getAlwaysVisibleOption()); - fillContainer(); + fillContainer(false, null); getController().getVisualBuilder().setShowInvisibleTags(JspEditorPlugi= n.getDefault().getPreferenceStore().getBoolean( IVpePreferencesPage.SHOW_NON_VISUAL_TAGS)); getController().getPageContext().getBundle().updateShowBundleUsageAsEL= (); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/mozilla/MozillaEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -134,6 +134,7 @@ private static Map layoutIcons; private static Map layoutNames; private static List layoutValues; + private int currentOrientationIndex =3D 1; static { layoutIcons =3D new HashMap(); layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE= , ICON_ORIENTATION_SOURCE_LEFT); @@ -265,7 +266,7 @@ * https://jira.jboss.org/jira/browse/JBIDE-4152 * Compute initial icon state and add it to the tool bar. */ - int currentOrientationIndex =3D layoutValues.indexOf(JspEditorPlugin + currentOrientationIndex =3D layoutValues.indexOf(JspEditorPlugin .getDefault().getPreferenceStore().getString( IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); int newIndx =3D currentOrientationIndex+1; @@ -285,35 +286,11 @@ * Rotate editors orientation clockwise. Store this new * orientation to the preferences. */ - int currentOrientationIndex =3D layoutValues - .indexOf(JspEditorPlugin - .getDefault() - .getPreferenceStore() - .getString( - IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); - int newIndx =3D currentOrientationIndex + 1; - if (newIndx =3D=3D layoutValues.size()) { - newIndx =3D newIndx % layoutValues.size(); + currentOrientationIndex++; + if (currentOrientationIndex =3D=3D layoutValues.size()) { + currentOrientationIndex =3D currentOrientationIndex % layoutValues.si= ze(); } - String newOrientation =3D layoutValues.get(newIndx); - JspEditorPlugin.getDefault().getPreferenceStore().setValue( - IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, - newOrientation); - - /* - * Compute next step orientation and display appropriate icon. - */ - currentOrientationIndex =3D layoutValues - .indexOf(JspEditorPlugin - .getDefault() - .getPreferenceStore() - .getString( - IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); - newIndx =3D currentOrientationIndex + 1; - if (newIndx =3D=3D layoutValues.size()) { - newIndx =3D newIndx % layoutValues.size(); - } - newOrientation =3D layoutValues.get(newIndx); + String newOrientation =3D layoutValues.get(currentOrientationIndex); rotateEditorsItem.setImage(ImageDescriptor.createFromFile( MozillaEditor.class, layoutIcons.get(newOrientation)) .createImage()); @@ -322,10 +299,10 @@ * Call filContainer() from VpeEditorPart * to redraw CustomSashForm with new layout. */ - getController().getPageContext().getEditPart().fillContainer(); + getController().getPageContext().getEditPart().fillContainer(true, new= Orientation); } }); - + = verBar.pack(); return verBar; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/xpl/CustomSashForm.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/CustomSashForm.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -1154,15 +1154,21 @@ } = public void changeOrientation() { - int prefsOrientation =3D getSplittingFromPreferences(); + int prefsOrientation =3D getSplittingDirection(JspEditorPlugin.getDefaul= t().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); if (getOrientation() !=3D prefsOrientation) { setOrientation(prefsOrientation); } } = - public static int getSplittingFromPreferences() { - String splitting =3D JspEditorPlugin.getDefault().getPreferenceStore() - .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + /** + * Computes the splitting style: + * SWT.HORIZONTAL or SWT.VERTICAL + * = + * @param splitting source-visual editors splitting value + * @return integer style value + */ + public static int getSplittingDirection(String splitting) { if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE .equalsIgnoreCase(splitting) || IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE @@ -1173,15 +1179,20 @@ } } = - public static boolean isSourceEditorFirst() { - boolean sourceEditorFirst =3D false; - String splitting =3D JspEditorPlugin.getDefault().getPreferenceStore() - .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); - if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE + /** + * Checks if the source editor is displayed on the first place, = + * i.e. on the top, or to the left. + * + * @param splitting source-visual editors splitting value + * @return true when the source goes first + */ + public static boolean isSourceEditorFirst(String splitting) { + boolean sourceEditorFirst =3D true; + if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE .equalsIgnoreCase(splitting) - || IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE + || IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE .equalsIgnoreCase(splitting)) { - sourceEditorFirst =3D true; + sourceEditorFirst =3D false; } return sourceEditorFirst; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/xpl/SashSetting.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/SashSetting.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xp= l/SashSetting.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -46,20 +46,22 @@ .getInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS); int[] weights =3D sash.getWeights(); if (weights.length > 2) { + String splitting =3D JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); = if (defaultWeight =3D=3D 0) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { sash.maxDown(); } else { sash.maxUp(); } } else if (defaultWeight =3D=3D 1000) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { sash.maxUp(); } else { sash.maxDown(); } } else { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { weights[0] =3D 1000 - defaultWeight; weights[1] =3D defaultWeight; } else { --===============4599230394317461286==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:09:17 2009 Content-Type: multipart/mixed; boundary="===============8065609365148707574==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17727 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic and 4 other directories. Date: Fri, 25 Sep 2009 08:09:17 -0400 Message-ID: <200909251209.n8PC9H42029767@svn01.web.mwc.hst.phx2.redhat.com> --===============8065609365148707574== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2009-09-25 08:09:16 -0400 (Fri, 25 Sep 2009) New Revision: 17727 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMapping.ja= va trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping= Impl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingIm= pl.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImp= l.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.= java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.= java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.j= ava trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingCompo= site.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4795 Some additions and changes for orm.xml-style mapping. Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-09-2= 5 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-09-2= 5 12:09:16 UTC (rev 17727) @@ -65,7 +65,7 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEmbeddable; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntityImpl; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMappingImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaJoinColumnImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaJoinTableImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaManyToManyMapping; @@ -86,7 +86,7 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mBasicMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mColumnImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mEntityImpl; -import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mIdMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mIdMappingImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mJoinColumnImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mJoinTableImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mManyToManyMapping; @@ -121,7 +121,7 @@ = @Override public JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent) { - return new HibernateJavaIdMapping(parent); + return new HibernateJavaIdMappingImpl(parent); } = public JavaGenericGenerator buildJavaGenericGenerator(JavaJpaContextNode = parent) { @@ -217,7 +217,7 @@ @Override public OrmIdMapping buildOrmIdMapping(OrmPersistentAttribute parent, XmlId resourceMapping) { - return new HibernateOrmIdMapping(parent, resourceMapping); + return new HibernateOrmIdMappingImpl(parent, resourceMapping); } = @Override Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/= org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMappin= g.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMapping.j= ava (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMapping.j= ava 2009-09-25 12:09:16 UTC (rev 17727) @@ -0,0 +1,23 @@ +/*************************************************************************= ****** + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.hibernate.jpt.core.internal.context.basic; + +import org.eclipse.jpt.core.context.IdMapping; + +/** + * @author Dmitry Geraskov + * + */ +public interface HibernateIdMapping extends IdMapping { + + +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hib= ernateIdMapping.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaCo= lumnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnIm= pl.java 2009-09-25 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnIm= pl.java 2009-09-25 12:09:16 UTC (rev 17727) @@ -93,7 +93,7 @@ } = public String getSpecifiedDBTableName() { - if (getSpecifiedName() =3D=3D null) return null; + if (getSpecifiedTable() =3D=3D null) return null; NamingStrategy ns =3D getJpaProject().getNamingStrategy(); if (getJpaProject().isNamingStrategyEnabled() && ns !=3D null){ try { @@ -104,7 +104,7 @@ HibernateJptPlugin.logException(m.getText(), e); } } - return this.getName(); + return this.getSpecifiedTable(); } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaId= Mapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= g.java 2009-09-25 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= g.java 2009-09-25 12:09:16 UTC (rev 17727) @@ -8,198 +8,18 @@ * Contributor: * Red Hat, Inc. - initial API and implementation *************************************************************************= *****/ + package org.jboss.tools.hibernate.jpt.core.internal.context.java; = -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; - -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.context.java.JavaGenerator; -import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.GenericJavaIdMapping; -import org.eclipse.jpt.utility.Filter; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator; -import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterato= r; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; -import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; +import org.eclipse.jpt.core.context.java.JavaIdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= rHolder; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= IdMapping; = /** * @author Dmitry Geraskov * */ -public class HibernateJavaIdMapping extends GenericJavaIdMapping = -implements GenericGeneratorHolder { - = - protected JavaGenericGenerator genericGenerator; - = - /** - * @param parent - */ - public HibernateJavaIdMapping(JavaPersistentAttribute parent) { - super(parent); - } +public interface HibernateJavaIdMapping extends HibernateIdMapping, + JavaIdMapping, GenericGeneratorHolder { = - @Override - protected void initialize() { - super.initialize(); - this.initializeGenericGenerator(); - } - = - @Override - public HibernateJavaColumn getColumn() { - return (HibernateJavaColumn) column; - } - = - @Override - public String getPrimaryKeyColumnName() { - return this.getColumn().getDBColumnName(); - } - = - protected void initializeGenericGenerator() { - GenericGeneratorAnnotation genericGeneratorResource =3D getResourceGener= icGenerator(); - if (genericGeneratorResource !=3D null) { - this.genericGenerator =3D buildGenericGenerator(genericGeneratorResourc= e); - } - } - = - protected GenericGeneratorAnnotation getResourceGenericGenerator() { - return (GenericGeneratorAnnotation) this.getResourcePersistentAttribute(= ).getSupportingAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAME); - } - = - protected JavaGenericGenerator buildGenericGenerator(GenericGeneratorAnno= tation genericGeneratorResource) { - JavaGenericGenerator generator =3D ((HibernateJpaFactory) getJpaFactory(= )).buildJavaGenericGenerator(this); - generator.initialize(genericGeneratorResource); - return generator; - } - = - @SuppressWarnings("unchecked") - public Iterator generators() { - return new CompositeIterator(super.generators(), - (getGenericGenerator() =3D=3D null) ? EmptyIterator.instance() = - : new SingleElementIterator(getGenericGenerator())); - } - - public JavaGenericGenerator addGenericGenerator(int index) { - if (getGenericGenerator() !=3D null) { - throw new IllegalStateException("genericGenerator already exists"); //$= NON-NLS-1$ - } - this.genericGenerator =3D ((HibernateJpaFactory)getJpaFactory()).buildJa= vaGenericGenerator(this); - GenericGeneratorAnnotation genericGeneratorResource =3D (GenericGenerato= rAnnotation)getResourcePersistentAttribute() - .addSupportingAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAM= E); - this.genericGenerator.initialize(genericGeneratorResource); - firePropertyChanged(GENERIC_GENERATORS_LIST, null, this.genericGenerator= ); - return this.genericGenerator; - } - - private JavaGenericGenerator getGenericGenerator() { - return genericGenerator; - } - - private void removeGenericGenerator() { - if (getGenericGenerator() =3D=3D null) { - throw new IllegalStateException("genericGenerator does not exist, canno= t be removed"); //$NON-NLS-1$ - } - JavaGenericGenerator oldGenericGenerator =3D this.genericGenerator; - this.genericGenerator =3D null; - this.getResourcePersistentAttribute().removeSupportingAnnotation(Generic= GeneratorAnnotation.ANNOTATION_NAME); - firePropertyChanged(GENERIC_GENERATORS_LIST, oldGenericGenerator,null); - } - = - private void setGenericGenerator(JavaGenericGenerator newGenericGenerator= ) { - JavaGenericGenerator oldGenericGenerator =3D this.genericGenerator; - this.genericGenerator =3D newGenericGenerator; - firePropertyChanged(GENERIC_GENERATORS_LIST, oldGenericGenerator, newGen= ericGenerator); - } - = - @Override - public void update() { - super.update(); - updateGenericGenerator(); - } - = - protected void updateGenericGenerator() { - GenericGeneratorAnnotation genericGeneratorResource =3D getResourceGener= icGenerator(); - if (genericGeneratorResource =3D=3D null) { - if (getGenericGenerator() !=3D null) { - setGenericGenerator(null); - } - } - else { - if (getGenericGenerator() =3D=3D null) { - setGenericGenerator(buildGenericGenerator(genericGeneratorResource)); - } - else { - getGenericGenerator().update(genericGeneratorResource); - } - } - } - = - @Override - public void validate(List messages, IReporter reporter, Compila= tionUnit astRoot) { - super.validate(messages, reporter, astRoot); - validateGenericGenerator(messages, reporter, astRoot); - } - = - private void validateGenericGenerator(List messages, IReporter = reporter, CompilationUnit astRoot) { - if (genericGenerator !=3D null){ - genericGenerator.validate(messages, reporter, astRoot); - } - } - = - @Override - public Iterator javaCompletionProposals(int pos, Filter f= ilter, - CompilationUnit astRoot) { - Iterator result =3D super.javaCompletionProposals(pos, filter, a= stRoot); - if (result !=3D null) { - return result; - } - if (this.getGenericGenerator() !=3D null) { - result =3D this.getGenericGenerator().javaCompletionProposals(pos, filt= er, astRoot); - if (result !=3D null) { - return result; - } - } - return null; - } - - public ListIterator genericGenerators() { - return genericGenerator =3D=3D null ? EmptyListIterator.instance() = - : new SingleElementListIterator(genericGenerator); - } - - public int genericGeneratorsSize() { - return genericGenerator =3D=3D null ? 0 : 1; - } - - public void moveGenericGenerator(int targetIndex, int sourceIndex) { - throw new UnsupportedOperationException(); - } - - public void removeGenericGenerator(int index) { - if (genericGeneratorsSize() < index + 1){ - throw new IndexOutOfBoundsException(); - } - removeGenericGenerator(); - } - - public void removeGenericGenerator(GenericGenerator generator) { - if (this.genericGenerator =3D=3D generator){ - removeGenericGenerator(); - } - } - = - @Override - public HibernateJpaProject getJpaProject() { - return (HibernateJpaProject) super.getJpaProject(); - } - } Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMa= ppingImpl.java (from rev 17715, trunk/hibernatetools/plugins/org.jboss.tool= s.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/contex= t/java/HibernateJavaIdMapping.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= gImpl.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= gImpl.java 2009-09-25 12:09:16 UTC (rev 17727) @@ -0,0 +1,204 @@ +/*************************************************************************= ****** + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.jpt.core.internal.context.java; + +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.core.context.java.JavaGenerator; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.context.java.GenericJavaIdMapping; +import org.eclipse.jpt.utility.Filter; +import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; +import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator; +import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterato= r; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorAnnotation; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateJavaIdMappingImpl extends GenericJavaIdMapping = +implements HibernateJavaIdMapping { + = + protected JavaGenericGenerator genericGenerator; + = + /** + * @param parent + */ + public HibernateJavaIdMappingImpl(JavaPersistentAttribute parent) { + super(parent); + } + + @Override + protected void initialize() { + super.initialize(); + this.initializeGenericGenerator(); + } + = + @Override + public HibernateJavaColumn getColumn() { + return (HibernateJavaColumn) column; + } + = + @Override + public String getPrimaryKeyColumnName() { + return this.getColumn().getDBColumnName(); + } + = + protected void initializeGenericGenerator() { + GenericGeneratorAnnotation genericGeneratorResource =3D getResourceGener= icGenerator(); + if (genericGeneratorResource !=3D null) { + this.genericGenerator =3D buildGenericGenerator(genericGeneratorResourc= e); + } + } + = + protected GenericGeneratorAnnotation getResourceGenericGenerator() { + return (GenericGeneratorAnnotation) this.getResourcePersistentAttribute(= ).getSupportingAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAME); + } + = + protected JavaGenericGenerator buildGenericGenerator(GenericGeneratorAnno= tation genericGeneratorResource) { + JavaGenericGenerator generator =3D ((HibernateJpaFactory) getJpaFactory(= )).buildJavaGenericGenerator(this); + generator.initialize(genericGeneratorResource); + return generator; + } + = + @SuppressWarnings("unchecked") + public Iterator generators() { + return new CompositeIterator(super.generators(), + (getGenericGenerator() =3D=3D null) ? EmptyIterator.instance() = + : new SingleElementIterator(getGenericGenerator())); + } + + public JavaGenericGenerator addGenericGenerator(int index) { + if (getGenericGenerator() !=3D null) { + throw new IllegalStateException("genericGenerator already exists"); //$= NON-NLS-1$ + } + this.genericGenerator =3D ((HibernateJpaFactory)getJpaFactory()).buildJa= vaGenericGenerator(this); + GenericGeneratorAnnotation genericGeneratorResource =3D (GenericGenerato= rAnnotation)getResourcePersistentAttribute() + .addSupportingAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAM= E); + this.genericGenerator.initialize(genericGeneratorResource); + firePropertyChanged(GENERIC_GENERATORS_LIST, null, this.genericGenerator= ); + return this.genericGenerator; + } + + private JavaGenericGenerator getGenericGenerator() { + return genericGenerator; + } + + private void removeGenericGenerator() { + if (getGenericGenerator() =3D=3D null) { + throw new IllegalStateException("genericGenerator does not exist, canno= t be removed"); //$NON-NLS-1$ + } + JavaGenericGenerator oldGenericGenerator =3D this.genericGenerator; + this.genericGenerator =3D null; + this.getResourcePersistentAttribute().removeSupportingAnnotation(Generic= GeneratorAnnotation.ANNOTATION_NAME); + firePropertyChanged(GENERIC_GENERATORS_LIST, oldGenericGenerator,null); + } + = + private void setGenericGenerator(JavaGenericGenerator newGenericGenerator= ) { + JavaGenericGenerator oldGenericGenerator =3D this.genericGenerator; + this.genericGenerator =3D newGenericGenerator; + firePropertyChanged(GENERIC_GENERATORS_LIST, oldGenericGenerator, newGen= ericGenerator); + } + = + @Override + public void update() { + super.update(); + updateGenericGenerator(); + } + = + protected void updateGenericGenerator() { + GenericGeneratorAnnotation genericGeneratorResource =3D getResourceGener= icGenerator(); + if (genericGeneratorResource =3D=3D null) { + if (getGenericGenerator() !=3D null) { + setGenericGenerator(null); + } + } + else { + if (getGenericGenerator() =3D=3D null) { + setGenericGenerator(buildGenericGenerator(genericGeneratorResource)); + } + else { + getGenericGenerator().update(genericGeneratorResource); + } + } + } + = + @Override + public void validate(List messages, IReporter reporter, Compila= tionUnit astRoot) { + super.validate(messages, reporter, astRoot); + validateGenericGenerator(messages, reporter, astRoot); + } + = + private void validateGenericGenerator(List messages, IReporter = reporter, CompilationUnit astRoot) { + if (genericGenerator !=3D null){ + genericGenerator.validate(messages, reporter, astRoot); + } + } + = + @Override + public Iterator javaCompletionProposals(int pos, Filter f= ilter, + CompilationUnit astRoot) { + Iterator result =3D super.javaCompletionProposals(pos, filter, a= stRoot); + if (result !=3D null) { + return result; + } + if (this.getGenericGenerator() !=3D null) { + result =3D this.getGenericGenerator().javaCompletionProposals(pos, filt= er, astRoot); + if (result !=3D null) { + return result; + } + } + return null; + } + + public ListIterator genericGenerators() { + return genericGenerator =3D=3D null ? EmptyListIterator.instance() = + : new SingleElementListIterator(genericGenerator); + } + + public int genericGeneratorsSize() { + return genericGenerator =3D=3D null ? 0 : 1; + } + + public void moveGenericGenerator(int targetIndex, int sourceIndex) { + throw new UnsupportedOperationException(); + } + + public void removeGenericGenerator(int index) { + if (genericGeneratorsSize() < index + 1){ + throw new IndexOutOfBoundsException(); + } + removeGenericGenerator(); + } + + public void removeGenericGenerator(GenericGenerator generator) { + if (this.genericGenerator =3D=3D generator){ + removeGenericGenerator(); + } + } + = + @Override + public HibernateJpaProject getJpaProject() { + return (HibernateJpaProject) super.getJpaProject(); + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColu= mnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl= .java 2009-09-25 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl= .java 2009-09-25 12:09:16 UTC (rev 17727) @@ -85,7 +85,7 @@ } = public String getSpecifiedDBTableName() { - if (getSpecifiedName() =3D=3D null) return null; + if (getSpecifiedTable() =3D=3D null) return null; NamingStrategy ns =3D getJpaProject().getNamingStrategy(); if (getJpaProject().isNamingStrategyEnabled() && ns !=3D null){ try { @@ -96,7 +96,7 @@ HibernateJptPlugin.logException(m.getText(), e); } } - return this.getName(); + return this.getSpecifiedTable(); } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEnti= tyImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl= .java 2009-09-25 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl= .java 2009-09-25 12:09:16 UTC (rev 17727) @@ -11,10 +11,12 @@ = package org.jboss.tools.hibernate.jpt.core.internal.context.orm; = +import java.util.Iterator; import java.util.ListIterator; = import org.eclipse.jpt.core.context.BaseJoinColumn; import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn; import org.eclipse.jpt.core.context.orm.OrmPersistentType; @@ -22,6 +24,7 @@ import org.eclipse.jpt.core.resource.orm.XmlEntity; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; +import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.hibernate.cfg.NamingStrategy; @@ -31,6 +34,7 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateTable; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; = @@ -51,40 +55,15 @@ return (HibernateJpaProject) super.getJpaProject(); } = -/* - @Override - protected String buildDefaultName() { - NamingStrategy ns =3D getJpaProject().getNamingStrategy(); - if (!isMetadataComplete()) { - JavaEntity javaEntity =3D getJavaEntity(); - if (javaEntity !=3D null) { - return javaEntity.getName(); - } - } - String className =3D getClass_(); - if (className !=3D null) { - try { - String shortCalssName =3D ClassTools.shortNameForClassNamed(className); - return ns =3D=3D null ? shortCalssName : ns.classToTableName(shortCals= sName); - } catch (Exception e) { - Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, - Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); - HibernateJptPlugin.logException(m.getText(), e); - } - } - return null; - } - = - = @Override public String getPrimaryTableName() { return this.getTable().getDBTableName(); - }*/ - + } + = /** * Convert Table to it's DB name. */ -/* @Override + @Override protected Iterator tableNames(Iterator tables) { return new TransformationIterator(tables) { @Override @@ -96,7 +75,7 @@ } = } }; - }*/ + } = @Override protected OrmBaseJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMa= pping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.= java 2009-09-25 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.= java 2009-09-25 12:09:16 UTC (rev 17727) @@ -11,46 +11,14 @@ = package org.jboss.tools.hibernate.jpt.core.internal.context.orm; = -import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.GenericOrmIdMapping; -import org.eclipse.jpt.core.resource.orm.XmlId; -import org.eclipse.wst.validation.internal.core.Message; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.cfg.NamingStrategy; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; +import org.eclipse.jpt.core.context.orm.OrmIdMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= IdMapping; = /** * @author Dmitry Geraskov * */ -public class HibernateOrmIdMapping extends GenericOrmIdMapping { +public interface HibernateOrmIdMapping extends HibernateIdMapping, + OrmIdMapping { = - public HibernateOrmIdMapping(OrmPersistentAttribute parent, - XmlId resourceMapping) { - super(parent, resourceMapping); - } - = - @Override - public HibernateJpaProject getJpaProject() { - return (HibernateJpaProject) super.getJpaProject(); - } - - @Override - public String getDefaultColumnName() { - NamingStrategy namingStrategy =3D getJpaProject().getNamingStrategy(); - if (getJpaProject().isNamingStrategyEnabled() && namingStrategy !=3D nul= l && getName() !=3D null){ - try { - return namingStrategy.propertyToColumnName(getName()); - } catch (Exception e) { - Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, = - Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); - HibernateJptPlugin.logException(m.getText(), e); - } - } - return super.getDefaultColumnName(); - } - } Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapp= ingImpl.java (from rev 17715, trunk/hibernatetools/plugins/org.jboss.tools.= hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/= orm/HibernateOrmIdMapping.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingI= mpl.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingI= mpl.java 2009-09-25 12:09:16 UTC (rev 17727) @@ -0,0 +1,124 @@ +/*************************************************************************= ****** + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.hibernate.jpt.core.internal.context.orm; + +import java.util.List; + +import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmIdMapping; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; +import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.resource.orm.XmlId; +import org.eclipse.wst.validation.internal.core.Message; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.hibernate.cfg.NamingStrategy; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateOrmIdMappingImpl extends GenericOrmIdMapping +implements HibernateOrmIdMapping { + + public HibernateOrmIdMappingImpl(OrmPersistentAttribute parent, + XmlId resourceMapping) { + super(parent, resourceMapping); + } + = + @Override + public HibernateJpaProject getJpaProject() { + return (HibernateJpaProject) super.getJpaProject(); + } + + @Override + public String getDefaultColumnName() { + NamingStrategy namingStrategy =3D getJpaProject().getNamingStrategy(); + if (getJpaProject().isNamingStrategyEnabled() && namingStrategy !=3D nul= l && getName() !=3D null){ + try { + return namingStrategy.propertyToColumnName(getName()); + } catch (Exception e) { + Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, + Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); + HibernateJptPlugin.logException(m.getText(), e); + } + } + return super.getDefaultColumnName(); + } + = + @Override + public HibernateOrmColumn getColumn() { + return (HibernateOrmColumn) column; + } + = + @Override + public String getPrimaryKeyColumnName() { + return this.getColumn().getDBColumnName(); + } + = + protected void validateColumn(List messages) { + OrmPersistentAttribute pa =3D this.getPersistentAttribute(); + String tableName =3D this.column.getTable(); + if (this.getTypeMapping().tableNameIsInvalid(tableName)) { + if (pa.isVirtual()) { + messages.add( + DefaultJpaValidationMessages.buildMessage( + IMessage.HIGH_SEVERITY, + JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE, + new String[] {pa.getName(), tableName, this.getColumn().getDBColumnN= ame()}, + this.column, = + this.column.getTableTextRange() + ) + ); + } else { + messages.add( + DefaultJpaValidationMessages.buildMessage( + IMessage.HIGH_SEVERITY, + JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, + new String[] {tableName, this.getColumn().getDBColumnName()}, = + this.column, = + this.column.getTableTextRange() + ) + ); + } + return; + } + = + if ( ! this.column.isResolved() && this.column.getDbTable() !=3D null) { + if (pa.isVirtual()) { + messages.add( + DefaultJpaValidationMessages.buildMessage( + IMessage.HIGH_SEVERITY, + JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME, + new String[] {pa.getName(), this.getColumn().getDBColumnName()}, + this.column, = + this.column.getNameTextRange() + ) + ); + } else { + messages.add( + DefaultJpaValidationMessages.buildMessage( + IMessage.HIGH_SEVERITY, + JpaValidationMessages.COLUMN_UNRESOLVED_NAME, + new String[] {this.getColumn().getDBColumnName()}, = + this.column, = + this.column.getNameTextRange() + ) + ); + } + } + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappi= ngComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComp= osite.java 2009-09-25 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComp= osite.java 2009-09-25 12:09:16 UTC (rev 17727) @@ -17,6 +17,7 @@ import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.GenerationComposite; import org.eclipse.jpt.ui.internal.mappings.details.TemporalTypeComposite; import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -28,13 +29,14 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateColumn; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= IdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; = /** * @author Dmitry Geraskov * */ -public class HibernateIdMappingComposite extends FormPane +public class HibernateIdMappingComposite extends FormPane implements JpaComposite{ /** * Creates a new HibernateIdMappingComposite. @@ -43,7 +45,7 @@ * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public HibernateIdMappingComposite(PropertyValueModel subjectHolder, + public HibernateIdMappingComposite(PropertyValueModel subjectHolder, Composite parent, WidgetFactory widgetFactory) { = @@ -59,6 +61,7 @@ }; } = + @SuppressWarnings("unchecked") @Override protected void initializeLayout(Composite container) { = @@ -67,8 +70,13 @@ = initializeTypePane(container); = - // Generation pane - new HibernateGenerationComposite(this, addSubPane(container, 10)); + if (getSubject() instanceof HibernateJavaIdMapping) { + // Generic Generator required only for Java. + new HibernateGenerationComposite((FormPane) this, addSubPane(container, 10)); = + } else { + new GenerationComposite(this, addSubPane(container, 10)); + } + = } = = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 20= 09-09-25 11:34:43 UTC (rev 17726) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 20= 09-09-25 12:09:16 UTC (rev 17727) @@ -17,7 +17,9 @@ import org.eclipse.jpt.core.context.java.JavaBasicMapping; import org.eclipse.jpt.core.context.java.JavaEntity; import org.eclipse.jpt.core.context.java.JavaIdMapping; +import org.eclipse.jpt.core.context.orm.OrmBasicMapping; import org.eclipse.jpt.core.context.orm.OrmEntity; +import org.eclipse.jpt.core.context.orm.OrmIdMapping; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.details.JpaComposite; @@ -34,6 +36,7 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mEntity; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mIdMapping; import org.jboss.tools.hibernate.jpt.ui.internal.java.details.HibernateJav= aEntityComposite; import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= BasicMappingComposite; import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= IdMappingComposite; @@ -116,5 +119,22 @@ WidgetFactory widgetFactory) { return new HibernateBasicMappingComposite(subjectHolder, parent, widgetF= actory); } + = + @Override + public JpaComposite createOrmBasicMappingComposite( + PropertyValueModel subjectHolder, + Composite parent, WidgetFactory widgetFactory) { + return new HibernateBasicMappingComposite(subjectHolder, parent, + widgetFactory); + } + = + @SuppressWarnings("unchecked") + @Override + public JpaComposite createOrmIdMappingComposite( + PropertyValueModel subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + return new HibernateIdMappingComposite((PropertyValueModel) subjectHolder, parent, widgetFactory); + } = } \ No newline at end of file --===============8065609365148707574==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:36:37 2009 Content-Type: multipart/mixed; boundary="===============0351418750592837789==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17728 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools: common/model and 1 other directories. Date: Fri, 25 Sep 2009 08:36:37 -0400 Message-ID: <200909251236.n8PCabjf003416@svn01.web.mwc.hst.phx2.redhat.com> --===============0351418750592837789== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:36:36 -0400 (Fri, 25 Sep 2009) New Revision: 17728 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/java/jsp/ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/TLDToPaletteHelper.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/URIConstants.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/XModelObjectConstants.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/XModelObjectConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/XModelObjectConstants.java 2009-09-25 12:09:16 UTC (rev 17727) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/XModelObjectConstants.java 2009-09-25 12:36:36 UTC (rev 17728) @@ -63,4 +63,9 @@ // "" = // "setModified" use ENUM for compare + + //drop & palette related = + public static final String START_TEXT =3D "start text"; //$NON-NLS-1$ + public static final String END_TEXT =3D "end text"; //$NON-NLS-1$ + public static final String REFORMAT =3D "automatically reformat tag bo= dy"; //$NON-NLS-1$ } Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/TLDToPaletteHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/TLDToPaletteHelper.java 2009-09-25 12:09:16 UTC (rev 17727) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/TLDToPaletteHelper.java 2009-09-25 12:36:36 UTC (rev 17728) @@ -1,180 +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.*; -import org.jboss.tools.common.model.*; - -public class TLDToPaletteHelper { - public static final String START_TEXT =3D "start text"; //$NON-NLS-1$ - public static final String END_TEXT =3D "end text"; //$NON-NLS-1$ - public static final String REFORMAT =3D "automatically reformat tag bo= dy"; //$NON-NLS-1$ - public static final String DESCRIPTION =3D "description"; //$NON-NLS-1$ - public static final String URI =3D URIConstants.LIBRARY_URI; - public static final String DEFAULT_PREFIX =3D URIConstants.DEFAULT_PRE= FIX; - public static final String ADD_TAGLIB =3D "add taglib"; //$NON-NLS-1$ - - public TLDToPaletteHelper() {} - - public XModelObject createMacroByTag(XModelObject tag, XModel model) { - Properties p =3D new Properties(); - String parentname =3D getTldName(tag.getParent()); - String prefix =3D (parentname.length() =3D=3D 0) ? "" : parentname= + ":"; //$NON-NLS-1$ //$NON-NLS-2$ - String shortname =3D tag.getAttributeValue(XModelObjectConstants.A= TTR_NAME); - String name =3D prefix + shortname; - String tagname =3D shortname; ///name; - p.setProperty(XModelObjectConstants.ATTR_NAME, shortname); - boolean empty =3D "empty".equals(tag.getAttributeValue("bodyconten= t")); //$NON-NLS-1$ //$NON-NLS-2$ - if(!empty) p.setProperty(END_TEXT, ""); //$NON-N= LS-1$ //$NON-NLS-2$ - p.setProperty(START_TEXT, getStartText(tag, empty, tagname)); - p.setProperty(DESCRIPTION, getTagDescription(tag, empty, name)); - if(!empty) p.setProperty(REFORMAT, XModelObjectConstants.YES); - return model.createModelObject("SharableMacroHTML", p); //$NON-NLS= -1$ - } - - public static String getTldName(XModelObject tld) { - if(tld =3D=3D null) return ""; //$NON-NLS-1$ - String n =3D tld.getAttributeValue("shortname"); //$NON-NLS-1$ - if(n =3D=3D null) return ""; //$NON-NLS-1$ - if(n.length() =3D=3D 0) { - n =3D tld.getAttributeValue(XModelObjectConstants.ATTR_NAME); - int q =3D n.lastIndexOf('-'); - if(q >=3D 0) n =3D n.substring(q + 1); - } - int s =3D n.lastIndexOf(' '); - if(s >=3D 0) n =3D n.substring(s + 1); - return n.toLowerCase(); - } - - private String getStartText(XModelObject tag, boolean empty, String na= me) { - StringBuffer sb =3D new StringBuffer(); - sb.append("<").append(name); //$NON-NLS-1$ - XModelObject[] as =3D tag.getChildren(); - boolean found =3D false; - for (int i =3D 0; i < as.length; i++) { - if(!TLDUtil.isAttribute(as[i])) continue; - String required =3D as[i].getAttributeValue("required"); //$NO= N-NLS-1$ - if(!XModelObjectConstants.TRUE.equals(required) && !XModelObje= ctConstants.YES.equals(required)) continue; - sb.append(' ').append(as[i].getAttributeValue(XModelObjectCons= tants.ATTR_NAME)).append("=3D\""); //$NON-NLS-1$ - if(!found) { - sb.append('|'); - found =3D true; - } - sb.append('"'); - } - if(empty) sb.append(XModelObjectConstants.SEPARATOR); - sb.append(">"); //$NON-NLS-1$ - return sb.toString(); - } - - private String getTagDescription(XModelObject tag, boolean empty, Stri= ng name) { -// String info =3D TLDUtil.getTagDescription(tag); - StringBuffer sb =3D new StringBuffer(); - sb.append("Syntax:

");
-        if (empty) =

-        	sb.append("<").append(name).append(" />");  //$NON-NLS-1$ /=
/$NON-NLS-2$
-        else =

-        	sb.append("<").append(name).append(">

</=
").append(name).append(">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        sb.append("

Attributes:

");
-		int k =3D 0;
-		 XModelObject[] as =3D tag.getChildren();
-		 for (int i =3D 0; i < as.length; i++) {
-			 if(!TLDUtil.isAttribute(as[i])) continue;
-			 if(!isRequired(as[i])) continue;
-			 sb.append("").append(as[i].getAttributeValue(XModelObjectConstants.=
ATTR_NAME)).append(""); //$NON-NLS-1$ //$NON-NLS-2$
-			 ++k;
-			 if(k < as.length) sb.append(", "); //$NON-NLS-1$
-		 }
-		 for (int i =3D 0; i < as.length; i++) {
-			 if(isRequired(as[i])) continue;
-			 sb.append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME));
-			 ++k;
-			 if(k < as.length) sb.append(", "); //$NON-NLS-1$
-		}
-        =

-        sb.append("

"); //$NON-NLS-1$ - -/* - sb.append("").append("\n "); - sb.append("

").append("\n "); - if(info.length() > 0) { - sb.append("").append("\n "); - sb.append("").a= ppend("\n "); - sb.append("").append("\n "); - } - sb.append("").append("\n "); - sb.append("").append("\n "); - sb.append("").append("\n "); - sb.append("

").append(info).append("

").append("\n "); - sb.append("Syntax:=


");
-        if(empty) sb.append("<" + name + " />"); else sb.append("<=
;" + name + ">
</" + name + ">");
-        sb.append("

").append("\n "); - sb.append("
").append("\n "); - sb.append("Atributes:").append("\n "); - sb.append("


").append("\n    ");
-        int k =3D 0;
-        XModelObject[] as =3D tag.getChildren();
-        for (int i =3D 0; i < as.length; i++) {
-            if(!TLDUtil.isAttribute(as[i])) continue;
-            if(!isRequired(as[i])) continue;
-            sb.append("").append(as[i].getAttributeValue(XModelObjectCo=
nstants.ATTR_NAME)).append("");
-            ++k;
-            if(k < as.length) sb.append(',');
-            sb.append("\n    ");
-        }
-        for (int i =3D 0; i < as.length; i++) {
-            if(isRequired(as[i])) continue;
-            sb.append(as[i].getAttributeValue(XModelObjectConstants.ATTR_N=
AME));
-            ++k;
-            if(k < as.length) sb.append(',');
-            sb.append("\n    ");
-        }
-        sb.append("

").append("\n "); - sb.append("

").append('\n'); - sb.append("").append('\n'); -*/ - = - return sb.toString();///XModelObjectLoaderUtil.saveToXMLAttribute(= sb.toString()); - } - - private boolean isRequired(XModelObject attr) { - String required =3D attr.getAttributeValue("required"); //$NON-NLS= -1$ - return (XModelObjectConstants.TRUE.equals(required) || XModelObjec= tConstants.YES.equals(required)); - } - - public XModelObject createTabByTLD(XModelObject tld, XModel model) { - return createGroupByTLD(tld, model, "SharablePageTabHTML"); //$NON-NL= S-1$ - } - - public XModelObject createGroupByTLD(XModelObject tld, XModel model) { - return createGroupByTLD(tld, model, "SharableGroupHTML"); //$NON-NLS-= 1$ - } - - private XModelObject createGroupByTLD(XModelObject tld, XModel model, = String entity) { - Properties p =3D new Properties(); - p.setProperty(XModelObjectConstants.ATTR_NAME, capitalize(getTldNa= me(tld))); - p.setProperty(DESCRIPTION, TLDUtil.getTagDescription(tld)); - p.setProperty(DEFAULT_PREFIX, getTldName(tld)); - p.setProperty(URIConstants.LIBRARY_URI, "" + tld.getAttributeValue= ("uri")); //$NON-NLS-1$ //$NON-NLS-2$ - XModelObject tab =3D model.createModelObject(entity, p); - XModelObject[] tags =3D tld.getChildren(); - for (int i =3D 0; i < tags.length; i++) - if(TLDUtil.isTag(tags[i])) tab.addChild(createMacroByTag(tags[i]= , model)); - return tab; - } - - - private String capitalize(String s) { - return (s.length() =3D=3D 0) ? s : Character.toUpperCase(s.charAt(= 0)) + s.substring(1); - } - -} - Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/URIConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/URIConstants.java 2009-09-25 12:09:16 UTC (rev 17727) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/URIConstants.java 2009-09-25 12:36:36 UTC (rev 17728) @@ -1,17 +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; - -public interface URIConstants { - public String LIBRARY_URI =3D "library uri"; //$NON-NLS-1$ - public String LIBRARY_VERSION =3D "library version"; //$NON-NLS-1$ - public String DEFAULT_PREFIX =3D "default prefix"; //$NON-NLS-1$ -} --===============0351418750592837789==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:37:34 2009 Content-Type: multipart/mixed; boundary="===============1450695857070894866==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17729 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette. Date: Fri, 25 Sep 2009 08:37:34 -0400 Message-ID: <200909251237.n8PCbYL5003523@svn01.web.mwc.hst.phx2.redhat.com> --===============1450695857070894866== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:37:34 -0400 (Fri, 25 Sep 2009) New Revision: 17729 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/palette/PaletteInsertHelper.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/views/palette/PaletteViewPart.java Log: Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/views/palette/PaletteInsertHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-25 12:36:3= 6 UTC (rev 17728) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteInsertHelper.java 2009-09-25 12:37:3= 4 UTC (rev 17729) @@ -34,11 +34,10 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; -import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; -import org.jboss.tools.jst.web.tld.URIConstants; = /** * @author Jeremy @@ -46,15 +45,11 @@ public class PaletteInsertHelper { = public static final String PROPOPERTY_TAG_NAME =3D "tag name"; //$NON-N= LS-1$ - public static final String PROPOPERTY_START_TEXT =3D TLDToPaletteHelper.S= TART_TEXT; - public static final String PROPOPERTY_END_TEXT =3D TLDToPaletteHelper.E= ND_TEXT; + public static final String PROPOPERTY_START_TEXT =3D XModelObjectConstant= s.START_TEXT; + public static final String PROPOPERTY_END_TEXT =3D XModelObjectConstant= s.END_TEXT; public static final String PROPOPERTY_NEW_LINE =3D "new line"; //$NON-NLS= -1$ - public static final String PROPOPERTY_REFORMAT_BODY =3D TLDToPaletteHelp= er.REFORMAT; - public static final String PROPOPERTY_TAGLIBRARY_URI =3D URIConstants.LIB= RARY_URI; - public static final String PROPOPERTY_TAGLIBRARY_VERSION =3D URIConstants= .LIBRARY_VERSION; - public static final String PROPOPERTY_DEFAULT_PREFIX =3D URIConstants.DEF= AULT_PREFIX; + public static final String PROPOPERTY_REFORMAT_BODY =3D XModelObjectCons= tants.REFORMAT; public static final String PROPOPERTY_SELECTION_PROVIDER =3D "selectionPr= ovider"; //$NON-NLS-1$ - public static final String PROPOPERTY_ADD_TAGLIB =3D TLDToPaletteHelpe= r.ADD_TAGLIB; = static PaletteInsertHelper instance =3D new PaletteInsertHelper(); = Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/views/palette/PaletteViewPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteViewPart.java 2009-09-25 12:36:36 UT= C (rev 17728) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/views/palette/PaletteViewPart.java 2009-09-25 12:37:34 UT= C (rev 17729) @@ -35,7 +35,6 @@ import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; -import org.jboss.tools.jst.web.tld.URIConstants; = public class PaletteViewPart extends ViewPart implements IPartListener { = @@ -144,6 +143,8 @@ if(dropIntoEditor(editor, macro)) return; if(dropIntoEditor2(editor, macro)) return; = + //TODO implement a service +/** String tagname =3D macro.getAttributeValue("name"); //$NON-NLS-1$ String startText =3D "" + macro.getAttributeValue("start text"); //$NON-= NLS-1$ //$NON-NLS-2$ String endText =3D "" + macro.getAttributeValue("end text"); //$NON-NLS-= 1$ //$NON-NLS-2$ @@ -174,6 +175,7 @@ ); page.activate(part); } +*/ } = private boolean dropIntoEditor(ITextEditor editor, XModelObject macro) { --===============1450695857070894866==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:38:29 2009 Content-Type: multipart/mixed; boundary="===============3431840441365013232==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17730 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd. Date: Fri, 25 Sep 2009 08:38:29 -0400 Message-ID: <200909251238.n8PCcT8M003635@svn01.web.mwc.hst.phx2.redhat.com> --===============3431840441365013232== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:38:29 -0400 (Fri, 25 Sep 2009) New Revision: 17730 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/FileDropCommand.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/JSPPaletteInsertHelper.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/PaletteDropCommand.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/js= peditor/dnd/PaletteTaglibInserter.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/FileDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/FileDropCommand.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/FileDropCommand.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -54,12 +54,12 @@ properties.put(PaletteInsertHelper.PROPOPERTY_START_TEXT, generateStartT= ext()); properties.put(PaletteInsertHelper.PROPOPERTY_END_TEXT, generateEndText(= )); properties.put(PaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, getReformat= BodyProperty()); - properties.put(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI, uri); + properties.put(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI, uri); String version =3D ((TagProposal)getDefaultModel().getTagProposal()).get= LibraryVersion(); - properties.put(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_VERSION, versio= n); - properties.put(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX,getDefaultM= odel().getTagProposal().getPrefix()); + properties.put(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_VERSION, ver= sion); + properties.put(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX,getDefau= ltModel().getTagProposal().getPrefix()); properties.put(PaletteInsertHelper.PROPOPERTY_SELECTION_PROVIDER, getDef= aultModel().getDropData().getSelectionProvider()); - properties.put(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NO= N-NLS-1$ + properties.put(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //= $NON-NLS-1$ addCustomProperties(properties); JSPPaletteInsertHelper.getInstance().insertIntoEditor( getDefaultModel().getDropData().getSourceViewer(), Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/JSPPaletteInsertHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPPaletteInsertHelper.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/JSPPaletteInsertHelper.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -6,8 +6,14 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; +import org.jboss.tools.jst.web.tld.URIConstants; +import org.jboss.tools.jst.web.tld.model.helpers.TLDToPaletteHelper; = public class JSPPaletteInsertHelper extends PaletteInsertHelper { + public static final String PROPOPERTY_ADD_TAGLIB =3D TLDToPaletteHelpe= r.ADD_TAGLIB; + public static final String PROPOPERTY_TAGLIBRARY_URI =3D URIConstants.LIB= RARY_URI; + public static final String PROPOPERTY_TAGLIBRARY_VERSION =3D URIConstants= .LIBRARY_VERSION; + public static final String PROPOPERTY_DEFAULT_PREFIX =3D URIConstants.DEF= AULT_PREFIX; = static JSPPaletteInsertHelper instance =3D new JSPPaletteInsertHelper(); = Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/PaletteDropCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteDropCommand.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteDropCommand.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -39,9 +39,9 @@ import org.jboss.tools.common.model.ui.views.palette.PaletteInsertManager; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.web.tld.IWebProject; -import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.URIConstants; import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.jboss.tools.jst.web.tld.model.helpers.TLDToPaletteHelper; = /** * = @@ -68,9 +68,9 @@ newLine =3D properties.getProperty(PaletteInsertHelper.PROPOPERTY_NEW_LI= NE); if (newLine =3D=3D null) newLine=3D"true"; //$NON-NLS-1$ runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_NEW_LINE, n= ewLine); - String addTaglib =3D properties.getProperty(PaletteInsertHelper.PROPOPER= TY_ADD_TAGLIB); + String addTaglib =3D properties.getProperty(JSPPaletteInsertHelper.PROPO= PERTY_ADD_TAGLIB); if(addTaglib =3D=3D null) addTaglib =3D "true"; //$NON-NLS-1$ - runningProperties.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB,= addTaglib); + runningProperties.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGL= IB, addTaglib); } = public void execute() { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/jspeditor/dnd/PaletteTaglibInserter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteTaglibInserter.java 2009-09-25 12:37:34 UTC (rev 17729) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/j= speditor/dnd/PaletteTaglibInserter.java 2009-09-25 12:38:29 UTC (rev 17730) @@ -54,12 +54,12 @@ } = private boolean checkProperties(Properties p) { - return "true".equalsIgnoreCase(p.getProperty(PaletteInsertHelper.PROPOPE= RTY_ADD_TAGLIB)) && //$NON-NLS-1$ - p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI) !=3D null= && - p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).length() = > 0 && - !p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).equals(J= SP_URI) && - p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX) !=3D null= && - p.getProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX).length() = > 0 && + return "true".equalsIgnoreCase(p.getProperty(JSPPaletteInsertHelper.PROP= OPERTY_ADD_TAGLIB)) && //$NON-NLS-1$ + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI) !=3D n= ull && + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).length= () > 0 && + !p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI).equal= s(JSP_URI) && + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX) !=3D n= ull && + p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX).length= () > 0 && p.getProperty(PaletteInsertHelper.PROPOPERTY_START_TEXT) !=3D null; } = @@ -81,8 +81,8 @@ if(tl =3D=3D null) tl =3D JSPPaletteInsertHelper.getPrefixes(d.get()); Element root =3D xmlDocument.getDocumentElement(); = - String uri_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRAR= Y_URI); - String defaultPrefix_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY= _DEFAULT_PREFIX); + String uri_p =3D p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIB= RARY_URI); + String defaultPrefix_p =3D p.getProperty(JSPPaletteInsertHelper.PROPOPE= RTY_DEFAULT_PREFIX); String lineDelimiter =3D PaletteInsertHelper.getLineDelimiter(d); StringBuffer tg =3D new StringBuffer(TAGLIB_START).append(" uri=3D\"").= append(uri_p).append("\"").append(" prefix=3D\"").append(defaultPrefix_p).a= ppend("\"%>").append(lineDelimiter); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS= -3$ //$NON-NLS-4$ = @@ -90,7 +90,7 @@ //If taglib already exist check the prefix if changed if (tl.containsKey(uri_p)) { if (!tl.get(uri_p).equals(defaultPrefix_p)) { - p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String= )tl.get(uri_p)); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (Str= ing)tl.get(uri_p)); } } else if(!tl.containsValue(defaultPrefix_p)) { if (checkplace(xmlDocument, d, "jsp:directive.taglib", tg, p, v) =3D= =3D false) { //$NON-NLS-1$ @@ -143,7 +143,7 @@ } = private static boolean checkSelectedElement(HashMap map, I= SourceViewer v, Properties p){ - String taglibUri =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIB= RARY_URI); + String taglibUri =3D p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAG= LIBRARY_URI); if(taglibUri =3D=3D null) return false; = Node selectedNode =3D getSelectedNode(v, p); @@ -246,8 +246,8 @@ * with text formatting */ private static Properties checkTL(Element root, ISourceViewer v, Properti= es p, IDocument d) { - String uri_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY= _URI); - String defaultPrefix_p =3D p.getProperty(PaletteInsertHelper.PROPOPERTY_= DEFAULT_PREFIX); + String uri_p =3D p.getProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBR= ARY_URI); + String defaultPrefix_p =3D p.getProperty(JSPPaletteInsertHelper.PROPOPER= TY_DEFAULT_PREFIX); = HashMap map =3D new HashMap(); NamedNodeMap attrs =3D root.getAttributes(); @@ -262,7 +262,7 @@ = if (map.containsKey(uri_p) || checkSelectedElement(map, v, p)) { if (!map.get(uri_p).equals(defaultPrefix_p)) { - p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (String) = map.get(uri_p)); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, (Strin= g) map.get(uri_p)); } } else if(!map.containsValue(defaultPrefix_p)) { StringBuffer attribute =3D new StringBuffer("xmlns:").append(defaultPre= fix_p).append("=3D\"").append(uri_p).append("\""); //$NON-NLS-1$ //$NON-NL= S-2$ //$NON-NLS-3$ --===============3431840441365013232==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:39:23 2009 Content-Type: multipart/mixed; boundary="===============5541441701485073630==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17731 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld: model/helpers and 1 other directory. Date: Fri, 25 Sep 2009 08:39:23 -0400 Message-ID: <200909251239.n8PCdN87003751@svn01.web.mwc.hst.phx2.redhat.com> --===============5541441701485073630== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:39:23 -0400 (Fri, 25 Sep 2009) New Revision: 17731 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/URIConstants.java Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/model/helpers/TLDToPaletteHelper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/URIConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/URIConstants.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/URIConstants.java 2009-09-25 12:39:23 UTC (rev 17731) @@ -0,0 +1,17 @@ +/*************************************************************************= ****** + * 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; + +public interface URIConstants { + public String LIBRARY_URI =3D "library uri"; //$NON-NLS-1$ + public String LIBRARY_VERSION =3D "library version"; //$NON-NLS-1$ + public String DEFAULT_PREFIX =3D "default prefix"; //$NON-NLS-1$ +} Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst= /web/tld/model/helpers/TLDToPaletteHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/model/helpers/TLDToPaletteHelper.java 2009-09-25 12:38:29 UTC (rev 17730) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/model/helpers/TLDToPaletteHelper.java 2009-09-25 12:39:23 UTC (rev 17731) @@ -16,9 +16,9 @@ import org.jboss.tools.jst.web.tld.model.TLDUtil; = public class TLDToPaletteHelper { - public static final String START_TEXT =3D "start text"; //$NON-NLS-1$ - public static final String END_TEXT =3D "end text"; //$NON-NLS-1$ - public static final String REFORMAT =3D "automatically reformat tag bo= dy"; //$NON-NLS-1$ + public static final String START_TEXT =3D XModelObjectConstants.START_= TEXT; + public static final String END_TEXT =3D XModelObjectConstants.END_TEXT; + public static final String REFORMAT =3D XModelObjectConstants.REFORMAT; public static final String DESCRIPTION =3D "description"; //$NON-NLS-1$ public static final String URI =3D URIConstants.LIBRARY_URI; public static final String DEFAULT_PREFIX =3D URIConstants.DEFAULT_PRE= FIX; @@ -95,7 +95,7 @@ } for (int i =3D 0; i < as.length; i++) { if(isRequired(as[i])) continue; - sb.append(as[i].getAttributeValue("name")); //$NON-NLS-1$ + sb.append(as[i].getAttributeValue(XModelObjectConstants.ATTR_NAME)); ++k; if(k < as.length) sb.append(", "); //$NON-NLS-1$ } @@ -107,7 +107,7 @@ = private boolean isRequired(XModelObject attr) { String required =3D attr.getAttributeValue("required"); //$NON-NLS= -1$ - return ("true".equals(required) || "yes".equals(required)); //$NON= -NLS-1$ //$NON-NLS-2$ + return (XModelObjectConstants.TRUE.equals(required) || XModelObjec= tConstants.TRUE.equals(required)); } = public XModelObject createTabByTLD(XModelObject tld, XModel model) { @@ -120,7 +120,7 @@ = private XModelObject createGroupByTLD(XModelObject tld, XModel model, = String entity) { Properties p =3D new Properties(); - p.setProperty("name", capitalize(getTldName(tld))); //$NON-NLS-1$ + p.setProperty(XModelObjectConstants.ATTR_NAME, capitalize(getTldNa= me(tld))); p.setProperty(DESCRIPTION, TLDUtil.getTagDescription(tld)); p.setProperty(DEFAULT_PREFIX, getTldName(tld)); p.setProperty(URIConstants.LIBRARY_URI, "" + tld.getAttributeValue= ("uri")); //$NON-NLS-1$ //$NON-NLS-2$ --===============5541441701485073630==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:40:18 2009 Content-Type: multipart/mixed; boundary="===============0450107135171317556==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17732 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: toolbar/format/handler and 1 other directory. Date: Fri, 25 Sep 2009 08:40:18 -0400 Message-ID: <200909251240.n8PCeIbL004125@svn01.web.mwc.hst.phx2.redhat.com> --===============0450107135171317556== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:40:18 -0400 (Fri, 25 Sep 2009) New Revision: 17732 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/men= u/action/InsertAction.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/men= u/action/InsertAction2.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/too= lbar/format/handler/FormatHandler.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/menu/action/InsertAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction.java 2009-09-25 12:39:23 UTC (rev 17731) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction.java 2009-09-25 12:40:18 UTC (rev 17732) @@ -20,8 +20,8 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; -import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.URIConstants; +import org.jboss.tools.jst.web.tld.model.helpers.TLDToPaletteHelper; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.SelectionUtil; @@ -140,7 +140,7 @@ p.setProperty(URIConstants.LIBRARY_VERSION, libraryVersion); String addTaglib =3D item.getParent().getAttributeValue(TLDToPaletteHelp= er.ADD_TAGLIB); p.setProperty(URIConstants.DEFAULT_PREFIX, defaultPrefix); - p.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib); /* * Added by Dzmitry Sakovich Fix for JBIDE-1626 */ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/menu/action/InsertAction2.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction2.java 2009-09-25 12:39:23 UTC (rev 17731) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/me= nu/action/InsertAction2.java 2009-09-25 12:40:18 UTC (rev 17732) @@ -20,8 +20,8 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; -import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.URIConstants; +import org.jboss.tools.jst.web.tld.model.helpers.TLDToPaletteHelper; import org.jboss.tools.vpe.editor.menu.InsertType; import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.NodesManagingUtil; @@ -209,7 +209,7 @@ String addTaglib =3D item.getParent().getAttributeValue( TLDToPaletteHelper.ADD_TAGLIB); p.setProperty(URIConstants.DEFAULT_PREFIX, defaultPrefix); - p.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib); /* * Added by Dzmitry Sakovich Fix for JBIDE-1626 */ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/toolbar/format/handler/FormatHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/format/handler/FormatHandler.java 2009-09-25 12:39:23 UTC (rev 17731) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/format/handler/FormatHandler.java 2009-09-25 12:40:18 UTC (rev 17732) @@ -113,8 +113,8 @@ if(format) { p.setProperty(PaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, "yes"); //$= NON-NLS-1$ } - p.setProperty(PaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI, "http://www= .w3.org/TR/REC-html40"); //$NON-NLS-1$ - p.setProperty(PaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, ""); //$NON= -NLS-1$ + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_TAGLIBRARY_URI, "http://= www.w3.org/TR/REC-html40"); //$NON-NLS-1$ + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_DEFAULT_PREFIX, ""); //$= NON-NLS-1$ = ITextSelection sel =3D new TextSelection(startOffcet, length); ISelectionProvider selProvider =3D viewer.getSelectionProvider(); --===============0450107135171317556==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:54:11 2009 Content-Type: multipart/mixed; boundary="===============7701950814948390911==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17733 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools: jst/web/tld and 1 other directory. Date: Fri, 25 Sep 2009 08:54:11 -0400 Message-ID: <200909251254.n8PCsBsc006953@svn01.web.mwc.hst.phx2.redhat.com> --===============7701950814948390911== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:54:11 -0400 (Fri, 25 Sep 2009) New Revision: 17733 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/FilePathEncoderFactory.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/IFilePathEncoder.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/project/ModelNatureExtension.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/project/ModelNatureExtension.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ModelNatureExtension.java 2009-09-25 12:40:18 UTC (rev = 17732) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/project/ModelNatureExtension.java 2009-09-25 12:54:11 UTC (rev = 17733) @@ -6,9 +6,6 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ModelFeatureFactory; -import org.jboss.tools.jst.web.tld.IFilePathEncoder; = public class ModelNatureExtension { public static String EXTENSION_POINT =3D "org.jboss.tools.common.model.mo= delnatures"; //$NON-NLS-1$ @@ -17,7 +14,6 @@ String displayName; String pathEncoder; String watcherContributor; - IFilePathEncoder pathEncoderInstance; = public ModelNatureExtension() {} = @@ -29,25 +25,8 @@ return displayName; } = - public IFilePathEncoder getPathEncoder () { - if(pathEncoderInstance !=3D null) { - return pathEncoderInstance; - } - if(pathEncoder =3D=3D null) { - return null; - } - if(pathEncoder.length() =3D=3D 0) { - pathEncoder =3D null; - return null; - } - try { - pathEncoderInstance =3D (IFilePathEncoder)ModelFeatureFactory.getInstan= ce().createFeatureInstance(pathEncoder); - } catch (ClassCastException e) { - ModelPlugin.getPluginLog().logError(e); - } finally { - pathEncoder =3D null; - } - return pathEncoderInstance; + public String getPathEncoder () { + return pathEncoder; } = public String getWatcherContributor() { Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/FilePathEncoderFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/FilePathEncoderFactory.java 2009-09-25 12:40:18 UTC (rev 17732) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/FilePathEncoderFactory.java 2009-09-25 12:54:11 UTC (rev 17733) @@ -1,35 +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 org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.jboss.tools.common.model.project.ModelNatureExtension; - -public class FilePathEncoderFactory { - - public static IFilePathEncoder getEncoder(IProject project) { - if(project =3D=3D null || !project.isOpen()) return null; - ModelNatureExtension[] es =3D ModelNatureExtension.getInstances(); - for (int i =3D 0; i < es.length; i++) { - try { - if(project.hasNature(es[i].getName())) { - IFilePathEncoder encoder =3D es[i].getPathEncoder(); - if(encoder !=3D null) return encoder; - } - } catch (CoreException e) { - //ignore - all checks are done above - } - } - return null; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/IFilePathEncoder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/IFilePathEncoder.java 2009-09-25 12:40:18 UTC (rev 17732) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/IFilePathEncoder.java 2009-09-25 12:54:11 UTC (rev 17733) @@ -1,37 +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.Properties; - -import org.jboss.tools.common.model.XModelObject; - -public interface IFilePathEncoder { - public static String PATH_TYPE =3D "pathType"; //$NON-NLS-1$ - public static String PATH_ADDITION =3D "pathAddition"; //$NON-NLS-1$ - = - public static String ABSOLUTE_PATH =3D "absolute"; //$NON-NLS-1$ - public static String RELATIVE_PATH =3D "relative"; //$NON-NLS-1$ - = - /** - * Returns path that should be inserted to jsp page. - * = - * @path file path relative to WebContent - */ - public String encode(String path, XModelObject f, String tag, VpeTaglibMa= nager taglibs, Properties context); - = - /** - * Returns file path relative to WebContent - * = - * @path value on jsp page - */ - public String decode(String path, XModelObject f, String tag, VpeTaglibMa= nager taglibs, Properties context); -} --===============7701950814948390911==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:55:13 2009 Content-Type: multipart/mixed; boundary="===============1802897165467310706==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17734 - in trunk/jst/plugins/org.jboss.tools.jst.web: src/org/jboss/tools/jst/web/tld and 1 other directory. Date: Fri, 25 Sep 2009 08:55:13 -0400 Message-ID: <200909251255.n8PCtDhi007364@svn01.web.mwc.hst.phx2.redhat.com> --===============1802897165467310706== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:55:12 -0400 (Fri, 25 Sep 2009) New Revision: 17734 Added: trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facesconfig_2_0.xsd trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/FilePathEncoderFactory.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/IFilePathEncoder.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Added: trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facesconfig_2_= 0.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facesconfig_2_0.x= sd (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facesconfig_2_0.x= sd 2009-09-25 12:55:12 UTC (rev 17734) @@ -0,0 +1,2743 @@ + + + + + + + + + + $Id: web-facesconfig_2_0.xsd,v 1.1.8.2 2008/03/20 21:12:50 edb= urns Exp $ + + + + + + + Copyright 2007 Sun Microsystems, Inc., = + 901 San Antonio Road, = + Palo Alto, California 94303, U.S.A. = + All rights reserved. + + Sun Microsystems, Inc. has intellectual property = + rights relating to technology described in this document. In + particular, and without limitation, these intellectual + property rights may include one or more of the U.S. patents + listed at http://www.sun.com/patents and one or more + additional patents or pending patent applications in the + U.S. and other countries. + + This document and the technology which it describes are + distributed under licenses restricting their use, copying, + distribution, and decompilation. No part of this document + may be reproduced in any form by any means without prior + written authorization of Sun and its licensors, if any. + + Third-party software, including font technology, is + copyrighted and licensed from Sun suppliers. + + Sun, Sun Microsystems, the Sun logo, Solaris, Java, Java EE, + JavaServer Pages, Enterprise JavaBeans and the Java Coffee + Cup logo are trademarks or registered trademarks of Sun + Microsystems, Inc. in the U.S. and other countries. + + Federal Acquisitions: Commercial Software - Government Users + Subject to Standard License Terms and Conditions. + + + + + + + + + ... + + + The instance documents may indicate the published + version of the schema using xsi:schemaLocation attribute + for javaee namespace with the following location: + + http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd + + ]]> + + + + + + + + + + + + + The "faces-config" element is the root of the configuration + information hierarchy, and contains nested elements for all + of the other configuration settings. + + + + + + + + + Behavior IDs must be unique within a document. + + + + + + + + + + + + + Converter IDs must be unique within a document. + + + + + + + + + + + + + 'converter-for-class' element values must be unique + within a document. + + + + + + + + + + + + + Validator IDs must be unique within a document. + + + + + + + + + + + + + Managed bean names must be unique within a document. + + + + + + + + + + + + + + + + The "faces-config" element is the root of the configuration + information hierarchy, and contains nested elements for all + of the other configuration settings. + + + + + + + + + + + + + + + = + The "name" element within the top level "faces-confi= g" + element declares the name of this application + configuration resource. Such names are used + in the document ordering scheme specified in section + JSF.11.4.6. + = + + + + = + + + + + + + + + + + + + The metadata-complete attribute defines whether this + JavaServer Faces application is complete, or whether + the class files available to this module and packaged = with + this application should be examined for annotations + that specify configuration information. + = + This attribute is only inspected on the application = + configuration resource file located at "WEB-INF/faces-= config.xml". + The presence of this attribute on any application conf= iguration + resource other than the one located at "WEB-INF/faces-= config.xml", + including any files named using the javax.faces.CONFIG= _FILES + attribute, must be ignored. + + If metadata-complete is set to "true", the JavaServer = Faces + runtime must ignore any annotations that specify confi= guration + information, which might be present in the class files + of the application. + + If metadata-complete is not specified or is set to + "false", the JavaServer Faces runtime must examine the= class + files of the application for annotations, as specified= by + the specification. + + If "WEB-INF/faces-config.xml" is not present, the Java= Server + Faces runtime will assume metadata-complete to be "fal= se". + + The value of this attribute will have no impact on + runtime annotations such as @ResourceDependency or + @ListenerFor. + + + + + + + + + + + + + + Extension element for faces-config. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + + + Please see section JSF.11.4.6 for the specification of this = element. + = + + + + + + + + + + + + + This element contains a sequence of "id" elements, each of= which + refers to an application configuration resource by the "id" + declared on its faces-config element. This element can al= so contain + a single "others" element which specifies that this docume= nt comes + before or after other documents within the application. + + + + + + + + + = + + + + = + This element indicates that the ordering sub-element in wh= ich + it was placed should take special action regarding the ord= ering + of this application resource relative to other + application configuration resources. See section JSF.11.4= .6 + for the complete specification. + + + + + + + + + + + + + + + Only relevant if this is placed within the /WEB-INF/faces-co= nfig.xml. + Please see section JSF.11.4.6 for the specification for deta= ils. + + + + + + + + + + + + + + + + + + The "application" element provides a mechanism to define t= he + various per-application-singleton implementation artifacts= for + a particular web application that is utilizing = + JavaServer Faces. For nested elements that are not specif= ied, = + the JSF implementation must provide a suitable default. + + + + + + + + + = + The "action-listener" element contains the ful= ly = + qualified class name of the concrete = + ActionListener implementation class that will = be = + called during the Invoke Application phase of = the = + request processing lifecycle. + = + + + + + + + = + The "default-render-kit-id" element allows the = + application to define a renderkit to be used o= ther = + than the standard one. = + = + + + + + + + = + The base name of a resource bundle representin= g = + the message resources for this application. S= ee = + the JavaDocs for the "java.util.ResourceBundle= " = + class for more information on the syntax of = + resource bundle names. + = + + + + + + + = + The "navigation-handler" element contains the = + fully qualified class name of the concrete = + NavigationHandler implementation class that wi= ll = + be called during the Invoke Application phase = + of the request processing lifecycle, if the = + default ActionListener (provided by the JSF = + implementation) is used. + = + + + + + + + + The "partial-traversal" element contains the f= ully + qualified class name of the concrete + PartialTraversal implementation class that wil= l be + called during the "execute" and "render" phase= s of the + request processing lifecycle. + + + + + + + + = + The "view-handler" element contains the fully = + qualified class name of the concrete ViewHandl= er = + implementation class that will be called durin= g = + the Restore View and Render Response phases of= the = + request processing lifecycle. The faces = + implementation must provide a default = + implementation of this class. + = + + + + + + + = + The "state-manager" element contains the fully = + qualified class name of the concrete StateMana= ger = + implementation class that will be called durin= g = + the Restore View and Render Response phases of= the = + request processing lifecycle. The faces = + implementation must provide a default = + implementation of this class. + = + + + + + + + = + The "el-resolver" element contains the fully + qualified class name of the concrete + javax.el.ELResolver implementation class + that will be used during the processing of + EL expressions. + = + + + + + + + = + The "property-resolver" element contains the f= ully = + qualified class name of the concrete = + PropertyResolver implementation class that wil= l = + be used during the processing of value binding = + expressions. + = + + + + + + + + The "variable-resolver" element contains the f= ully + qualified class name of the concrete = + VariableResolver implementation class that wil= l = + be used during the processing of value binding = + expressions. + + + + + + + + + + + + + + + + + + + + + + + + + + + The resource-bundle element inside the application element + references a java.util.ResourceBundle instance by name + using the var element. ResourceBundles referenced in this + manner may be returned by a call to + Application.getResourceBundle() passing the current + FacesContext for this request and the value of the var + element below. + + + + + + + + + + = + The fully qualified class name of the + java.util.ResourceBundle instance. + = + + + + + + + = + The name by which this ResourceBundle instance + is retrieved by a call to + Application.getResourceBundle(). + = + + + + + + + + + + + + + + Extension element for application. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + + The "factory" element provides a mechanism to define the = + various Factories that comprise parts of the implementatio= n = + of JavaServer Faces. For nested elements that are not = + specified, the JSF implementation must provide a suitable = + default. + + + + + + + + + = + The "application-factory" element contains the = + fully qualified class name of the concrete = + ApplicationFactory implementation class that will = + be called when = + FactoryFinder.getFactory(APPLICATION_FACTORY) is + called. + = + + + + + + + = + The "exception-handler-factory" element contains t= he + fully qualified class name of the concrete + ExceptionHandlerFactory implementation class that = will + be called when = + FactoryFinder.getFactory(EXCEPTION_HANDLER_FACTORY= ) = + is called. + = + + + + + + + + The "external-context-factory" element contains the + fully qualified class name of the concrete + ExternalContextFactory implementation class that w= ill + be called when + FactoryFinder.getFactory(EXTERNAL_CONTEXT_FACTORY) + is called. + + + + + = + + + + = + The "faces-context-factory" element contains the + fully qualified class name of the concrete + FacesContextFactory implementation class that will + be called when = + FactoryFinder.getFactory(FACES_CONTEXT_FACTORY) = + is called. + = + + + + + + + + + The "partial-view-context-factory" element contain= s the + fully qualified class name of the concrete + PartialViewContextFactory implementation class tha= t will + be called when FactoryFinder.getFactory + (FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY) is ca= lled. + + + + + + + + + = + The "lifecycle-factory" element contains the fully + qualified class name of the concrete LifecycleFact= ory + implementation class that will be called when + FactoryFinder.getFactory(LIFECYCLE_FACTORY) is cal= led. + = + + + + + + + = + The "view-declaration-language-factory" element co= ntains = + the fully qualified class name of the concrete = + ViewDeclarationLanguageFactory + implementation class that will be called when + FactoryFinder.getFactory(VIEW_DECLARATION_FACTORY)= is called. + = + + + + + + + = + The "tag-handler-delegate-factory" element contain= s = + the fully qualified class name of the concrete = + ViewDeclarationLanguageFactory + implementation class that will be called when + FactoryFinder.getFactory(TAG_HANDLER_DELEGATE_FACT= ORY) is called. + = + + + + + + + + The "render-kit-factory" element contains the fully + qualified class name of the concrete RenderKitFact= ory + implementation class that will be called when + FactoryFinder.getFactory(RENDER_KIT_FACTORY) is = + called. + + + + + + + + + The "visit-context-factory" element contains the f= ully + qualified class name of the concrete VisitContextF= actory + implementation class that will be called when + FactoryFinder.getFactory(VISIT_CONTEXT_FACTORY) is = + called. + + + + + + + + + + + + + + + + Extension element for factory. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + + The "attribute" element represents a named, typed, value + associated with the parent UIComponent via the generic + attributes mechanism. + + Attribute names must be unique within the scope of the par= ent + (or related) component. + + + + + + + + + + = + The "attribute-name" element represents the name u= nder = + which the corresponding value will be stored, in t= he = + generic attributes of the UIComponent we are relat= ed = + to. + = + + + + + + + + The "attribute-class" element represents the Java = type + of the value associated with this attribute name. + + + + + + + + + + + + + + + + + + Extension element for attribute. It may contain = + implementation specific content. + + + + + + + + + + + + + + + + + The "component" element represents a concrete UIComponent + implementation class that should be registered under the + specified type identifier, along with its associated = + properties and attributes. Component types must be unique = + within the entire web application. + + Nested "attribute" elements identify generic attributes th= at = + are recognized by the implementation logic of this compone= nt. + Nested "property" elements identify JavaBeans properties o= f = + the component class that may be exposed for manipulation = + via tools. + + + + + + + + + + = + The "component-type" element represents the name u= nder = + which the corresponding UIComponent class should b= e = + registered. + = + + + + + + + = + The "component-class" element represents the fully = + qualified class name of a concrete UIComponent = + implementation class. + = + + + + + + + + + + + + + + + + + Extension element for component. It may contain = + implementation specific content. + + + + + + + + + + + + + + + + The "default-locale" element declares the default locale = + for this application instance. + + It must be specified as :language:[_:country:[_:variant:]] + without the colons, for example "ja_JP_SJIS". The + separators between the segments may be '-' or '_'. + + + + + + = = + + + + + + + + + + + + The "default-value" contains the value for the property or + attribute in which this element resides. This value diffe= rs + from the "suggested-value" in that the property or attribu= te + must take the value, whereas in "suggested-value" taking t= he + value is optional. + + + + + + + + + + + + + + + EL expressions present within a faces config file + must start with the character sequence of '#{' and + end with '}'. + + + + + + + + + + + + + + + Define the name and other design-time information for a fa= cet + that is associated with a renderer or a component. + + + + + + + + + + + The "facet-name" element represents the facet name = + under which a UIComponent will be added to its par= ent. = + It must be of type "Identifier". + + + + + + + + + + + + + + + + Extension element for facet. It may contain implementation + specific content. + + + + + + + + + + + + + + + + + The value of from-view-id must contain one of the followin= g = + values: + + - The exact match for a view identifier that is recogniz= ed + by the the ViewHandler implementation being used (such= as + "/index.jsp" if you are using the default ViewHandler). + + - A proper prefix of a view identifier, plus a trailing = + "*" character. This pattern indicates that all view = + identifiers that match the portion of the pattern up t= o = + the asterisk will match the surrounding rule. When mo= re = + than one match exists, the match with the longest patt= ern = + is selected. + + - An "*" character, which means that this pattern applie= s = + to all view identifiers. + + + + + + + + + + + + + + + The "from-action" element contains an action reference = + expression that must have been executed (by the default = + ActionListener for handling application level events) = + in order to select the navigation rule. If not specified, = + this rule will be relevant no matter which action referenc= e = + was executed (or if no action reference was executed). + + + + + + + + + + + + + + + + + The "if" element defines a condition that must resolve + to true in order for the navigation case on which it is + defined to be matched, with the existing match criteria + (action method and outcome) as a prerequiste, if present. + The condition is defined declaratively using a value + expression in the body of this element. The expression is + evaluated at the time the navigation case is being matched. + If the "from-outcome" is omitted and this element is + present, the navigation handler will match a null outcome + and use the condition return value to determine if the + case should be considered a match. + + + + + + + + + + + + + + + + + The "converter" element represents a concrete Converter + implementation class that should be registered under the + specified converter identifier. Converter identifiers mus= t = + be unique within the entire web application. + + Nested "attribute" elements identify generic attributes th= at + may be configured on the corresponding UIComponent in orde= r = + to affect the operation of the Converter. Nested "propert= y" + elements identify JavaBeans properties of the Converter + implementation class that may be configured to affect the + operation of the Converter. "attribute" and "property" = + elements are intended to allow component developers to = + more completely describe their components to tools and use= rs. + These elements have no required runtime semantics. + + + + + + + + + + + + The "converter-id" element represents the = + identifier under which the corresponding = + Converter class should be registered. + + + + + = + + + + + The "converter-for-class" element represents t= he = + fully qualified class name for which a Convert= er = + class will be registered. + + + + + + = + + + + + The "converter-class" element represents the fully + qualified class name of a concrete Converter = + implementation class. + + + + + + + + + Nested "attribute" elements identify generic + attributes that may be configured on the + corresponding UIComponent in order to affect the + operation of the Converter. This attribute is + primarily for design-time tools and is not + specified to have any meaning at runtime. + + + + + + + + + Nested "property" elements identify JavaBeans + properties of the Converter implementation class + that may be configured to affect the operation of + the Converter. This attribute is primarily for + design-time tools and is not specified to have + any meaning at runtime. + + + + + + + + + + + + + + + + Extension element for converter. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + + = + The "lifecycle" element provides a mechanism to specify + modifications to the behaviour of the default Lifecycle + implementation for this web application. + = + + + + + + = + + + = + The "phase-listener" element contains the fully = + qualified class name of the concrete PhaseListener = + implementation class that will be registered on = + the Lifecycle. + = + + = + + + + + + + + + + + + + + + Extension element for lifecycle. It may contain + implementation specific content. + + + + + + + + + + + = + + = + + + + + The localeType defines valid locale defined by ISO-639-1 + and ISO-3166. + + + + + + + + + + + + + + + + The "locale-config" element allows the app developer to = + declare the=C2=A0supported locales for this application. + + + + = + + + + = + + + + + + + + + + + + The "default-validators" element allows the app developer = to = + register a set of validators, referenced by identifier, th= at + are automatically assigned to any EditableValueHolder comp= onent + in the application, unless overridden or disabled locally. + + + + = + + + + + = + The "validator-id" element represents the identifi= er = + of a registered validator. + = + + + + + + + + + + + + + = + The "managed-bean" element represents a JavaBean, of a = + particular class, that will be dynamically instantiated = + at runtime (by the default VariableResolver implementation= ) = + if it is referenced as the first element of a value bindin= g = + expression, and no corresponding bean can be identified in = + any scope. In addition to the creation of the managed bea= n, = + and the optional storing of it into the specified scope, = + the nested managed-property elements can be used to = + initialize the contents of settable JavaBeans properties o= f = + the created instance. + = + + + + + + + + + + The "managed-bean-name" element represents the = + attribute name under which a managed bean will = + be searched for, as well as stored (unless the = + "managed-bean-scope" value is "none"). + + + + + + + + + The "managed-bean-class" element represents the fu= lly + qualified class name of the Java class that will b= e = + used`to instantiate a new instance if creation of = the = + specified`managed bean is requested. + + The specified class must conform to standard JavaB= eans + conventions. In particular, it must have a public + zero-arguments constructor, and zero or more public + property setters. + + + + + + + + + The "managed-bean-scope" element represents the sc= ope = + into which a newly created instance of the specifi= ed = + managed bean will be stored (unless the value is = + "none"). + + + + + + + + + + + + + + + + This attribute is only considered when associated with + an application-scoped managed bean. If the value of th= e eager + attribute is true the runtime must instantiate this cl= ass + and store the instance within the application scope wh= en the + application starts. + + If eager is unspecified or is false, the default "lazy" + instantiation and scoped storage of the managed bean + will occur. + + + + + + + + + + + + + + Extension element for managed-bean. It may contain + implementation specific content. + + + + + + + + + + + + + = + + + + + + element's body content, which includes all of the scopes + normally used in a web application, plus the "none" value + indicating that a created bean should not be stored into + any scope. Alternatively, an EL expression may be used + as the value of this element. The result of evaluating th= is + expression must by of type java.util.Map. + ]]> + + + + + + + + + + + + + + + + = + The "managed-property" element represents an individual = + property of a managed bean that will be configured to the = + specified value (or value set) if the corresponding = + managed bean is automatically created. + = + + + + + + + + = + The "property-name" element represents the JavaBea= ns = + property name under which the corresponding value = may = + be stored. + = + + + + + + + = + The "property-class" element represents the Java t= ype = + of the value associated with this property name. = + If not specified, it can be inferred from existing = + classes; however, this element should be specified = + if the configuration file is going to be the sourc= e = + for generating the corresponding classes. + = + + + + + + + + + + + + + + + + + + + + = + The "map-entry" element reprsents a single key-entry pair = + that will be added to the computed value of a managed = + property of type java.util.Map. + = + + + + + + + + The "key" element is the String representation of = a = + map key that will be stored in a managed property = of = + type java.util.Map. + + + + + + + + + + + + + + + + + + = + The "map-entries' element represents a set of key-entry pa= irs = + that will be added to the computed value of a managed prop= erty = + of type java.util.Map. In addition, the Java class types = + of the key and entry values may be optionally declared. + = + + + + + + + + = + The "key-class" element defines the Java type to w= hich = + each "key" element in a set of "map-entry" element= s = + will be converted to. If omitted, "java.lang.Stri= ng" = + is assumed. + = + + + + = + + + + + + + + + + + = + The "navigation-case" element describes a particular = + combination of conditions that must match for this case to = + be executed, and the view id of the component tree that = + should be selected next. + = + + + + + + + + + + + The "from-outcome" element contains a logical outc= ome + string returned by the execution of an application + action method selected via an "actionRef" property + (or a literal value specified by an "action" prope= rty) + of a UICommand component. If specified, this rule = + will be relevant only if the outcome value matches = + this element's value. If not specified, this rule = + will be relevant if the outcome value is non-null + or, if the "if" element is present, will be releva= nt + for any outcome value, with the assumption that the + condition specified in the "if" element ultimately + determines if this rule is a match. + + + + + + + + + Please see section JSF.7.4.2 for the specification = of this element. + + + + + + + + + The "to-view-id" element contains the view identif= ier = + of the next view that should be displayed if this + navigation rule is matched. If the contents is a + value expression, it should be resolved by the + navigation handler to obtain the view identifier. + + + + + + + + + + + + + + + + The "navigation-rule" element represents an individual = + decision rule that will be utilized by the default = + NavigationHandler implementation to make decisions on = + what view should be displayed next, based on the = + view id being processed. + + + + + + + + + + + + + + + + + + + Extension element for navigation-rule. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + + The "null-value" element indicates that the managed + property in which we are nested will be explicitly + set to null if our managed bean is automatically + created. This is different from omitting the managed + property element entirely, which will cause no + property setter to be called for this property. + + The "null-value" element can only be used when the + associated "property-class" identifies a Java class, + not a Java primitive. + + + + + + = + + + + + + = + The "property" element represents a JavaBean property of t= he = + Java class represented by our parent element. + + Property names must be unique within the scope of the Java = + class that is represented by the parent element, and must = + correspond to property names that will be recognized when = + performing introspection against that class via = + java.beans.Introspector. + = + + + + + + + + = + The "property-name" element represents the JavaBea= ns = + property name under which the corresponding value = + may be stored. + = + + + + + + + = + The "property-class" element represents the Java t= ype = + of the value associated with this property name. = + If not specified, it can be inferred from existing = + classes; however, this element should be specified= if = + the configuration file is going to be the source f= or = + generating the corresponding classes. + = + + + + = + + + + + + + + + + + + + + Extension element for property. It may contain = + implementation specific content. + + + + + + + + + + + + + + + + + The "redirect" element indicates that navigation to the + specified "to-view-id" should be accomplished by = + performing an HTTP redirect rather than the usual = + ViewHandler mechanisms. + + + + + + + + + + + + + + + + + + The "view-param" element, only valid within + a "redirect" element, contains child "name" + and "value" elements that must be included in the + redirect url when the redirect is performed. + + + + + + + + + + + + + + + + + = + The "referenced-bean" element represents at design time th= e = + promise that a Java object of the specified type will exis= t at = + runtime in some scope, under the specified key. This can = be = + used by design time tools to construct user interface dial= ogs = + based on the properties of the specified class. The prese= nce = + or absence of a referenced bean element has no impact on t= he = + JavaServer Faces runtime environment inside a web applicat= ion. + = + + + + + + + + = + The "referenced-bean-name" element represents the = + attribute name under which the corresponding = + referenced bean may be assumed to be stored, in on= e = + of 'request', 'session', 'view', 'application' = + or a custom scope. + = + + + + + + + + The "referenced-bean-class" element represents the = + fully qualified class name of the Java class = + (either abstract or concrete) or Java interface = + implemented by the corresponding referenced bean. = + + + + + + + + + + + + + + = + The "render-kit" element represents a concrete RenderKit = + implementation that should be registered under the specifi= ed = + render-kit-id. If no render-kit-id is specified, the = + identifier of the default RenderKit = + (RenderKitFactory.DEFAULT_RENDER_KIT) is assumed. + = + + + = + + + + + + = + The "render-kit-id" element represents an identifi= er = + for the RenderKit represented by the parent = + "render-kit" element. + = + + + + + + + = + The "render-kit-class" element represents the full= y = + qualified class name of a concrete RenderKit = + implementation class. + = + + + + + + + + + + + + + + + + + The "client-behavior-renderer" element represents a concre= te = + ClientBehaviorRenderer implementation class that should be = + registered under the specified behavior renderer type iden= tifier, + in the RenderKit associated with the parent "render-kit" + element. Client Behavior renderer type must be unique wit= hin the RenderKit + associated with the parent "render-kit" element. + + Nested "attribute" elements identify generic component + attributes that are recognized by this renderer. + + + + + + + + + + The "client-behavior-renderer-type" element repres= ents a renderer type + identifier for the Client Behavior Renderer repres= ented by the parent + "client-behavior-renderer" element. + + + + + + + + + The "client-behavior-renderer-class" element repre= sents the fully + qualified class name of a concrete Client Behavior= Renderer + implementation class. + + + + + + + + + + + = + The "renderer" element represents a concrete Renderer = + implementation class that should be registered under the = + specified component family and renderer type identifiers, = + in the RenderKit associated with the parent "render-kit" = + element. Combinations of component family and = + renderer type must be unique within the RenderKit = + associated with the parent "render-kit" element. + + Nested "attribute" elements identify generic component = + attributes that are recognized by this renderer. + = + + + = + + + + + + = + The "component-family" element represents the = + component family for which the Renderer represente= d = + by the parent "renderer" element will be used. + = + + = + + + + + = + The "renderer-type" element represents a renderer = type = + identifier for the Renderer represented by the par= ent = + "renderer" element. + = + + + + + + + + The "renderer-class" element represents the fully + qualified class name of a concrete Renderer + implementation class. + + + + + + + + + + + + + + + + + + Extension element for renderer. It may contain implementa= tion + specific content. + + + + + + + + + + + + + + + + + Extension element for render-kit. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + + The "suggested-value" contains the value for the property = or + attribute in which this element resides. This value is = + advisory only and is intended for tools to use when = + populating pallettes. + + + + + + + + + + + + + + + The "supported-locale" element allows authors to declare + which locales are supported in this application instance. + + It must be specified as :language:[_:country:[_:variant:]] + without the colons, for example "ja_JP_SJIS". The + separators between the segments may be '-' or '_'. + + + + + + = + + + + + + + + + + + The "behavior" element represents a concrete Behavior = + implementation class that should be registered under the + specified behavior identifier. Behavior identifiers must + be unique within the entire web application. + + Nested "attribute" elements identify generic attributes th= at + may be configured on the corresponding UIComponent in order + to affect the operation of the Behavior. Nested "property" + elements identify JavaBeans properties of the Behavior = + implementation class that may be configured to affect the + operation of the Behavior. "attribute" and "property" + elements are intended to allow component developers to + more completely describe their components to tools and use= rs. + These elements have no required runtime semantics. + + + + + + + + + + The "behavior-id" element represents the identifier + under which the corresponding Behavior class should + be registered. + + + + + + + + + The "behavior-class" element represents the fully + qualified class name of a concrete Behavior = + implementation class. + + + + + + + + + Nested "attribute" elements identify generic + attributes that may be configured on the + corresponding UIComponent in order to affect the + operation of the Behavior. This attribute is + primarily for design-time tools and is not + specified to have any meaning at runtime. + + + + + + + + + + Nested "property" elements identify JavaBeans + properties of the Behavior implementation class + that may be configured to affect the operation of + the Behavior. This attribute is primarily for + design-time tools and is not specified to have + any meaning at runtime. + + + + + + + + + + + + + + + Extension element for behavior. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + The "validator" element represents a concrete Validator + implementation class that should be registered under the + specified validator identifier. Validator identifiers mus= t = + be unique within the entire web application. + + Nested "attribute" elements identify generic attributes th= at = + may be configured on the corresponding UIComponent in orde= r = + to affect the operation of the Validator. Nested "propert= y" + elements identify JavaBeans properties of the Validator + implementation class that may be configured to affect the + operation of the Validator. "attribute" and "property" = + elements are intended to allow component developers to = + more completely describe their components to tools and use= rs. + These elements have no required runtime semantics. + + + + + + + + + = + The "validator-id" element represents the identifi= er = + under which the corresponding Validator class shou= ld = + be registered. + = + + = + + + + + = + The "validator-class" element represents the fully = + qualified class name of a concrete Validator = + implementation class. = + = + + + + + + + = + Nested "attribute" elements identify generic + attributes that may be configured on the + corresponding UIComponent in order to affect the + operation of the Validator. This attribute is + primarily for design-time tools and is not + specified to have any meaning at runtime. + + + + + + + + + + Nested "property" elements identify JavaBeans + properties of the Validator implementation class + that may be configured to affect the operation of + the Validator. This attribute is primarily for + design-time tools and is not specified to have + any meaning at runtime. + + + + + + + + + + + + + + + + Extension element for validator. It may contain + implementation specific content. + + + + + + + + + + + + + + + + + The "value" element is the String representation of + a literal value to which a scalar managed property + will be set, or a value binding expression ("#{...}") + that will be used to calculate the required value. + It will be converted as specified for the actual + property type. + + + + + + = + + = + + + + = + The "value-class" element defines the Java type to which e= ach + "value" element's value will be converted to, prior to add= ing = + it to the "list-entries" list for a managed property that = is = + a java.util.List, or a "map-entries" map for a managed = + property that is a java.util.Map. = + = + + + + + + + + + + + + + = + The "list-entries" element represents a set of initializat= ion + elements for a managed property that is a java.util.List o= r an + array. In the former case, the "value-class" element can = + optionally be used to declare the Java type to which each = + value should be converted before adding it to the Collecti= on. + = + + + + + + + + + + + + + + + + + + + The presence of this element within the "application" elem= ent in + an application configuration resource file indicates the + developer wants to add an SystemEventListener to this + application instance. Elements nested within this element= allow + selecting the kinds of events that will be delivered to the + listener instance, and allow selecting the kinds of classe= s that + can be the source of events that are delivered to the list= ener + instance. + + + + + + + + + The "system-event-listener-class" element contains + the fully qualified class name of the concrete + SystemEventListener implementation class that will= be + called when events of the type specified by the + "system-event-class" are sent by the runtime. + + + + + + + + + The "system-event-class" element contains the fully + qualified class name of the SystemEvent subclass f= or + which events will be delivered to the class whose = fully + qualified class name is given by the + "system-event-listener-class" element. + + + + + + + + + The "source-class" element, if present, contains t= he + fully qualified class name of the class that will = be the + source for the event to be delivered to the class = whose + fully qualified class name is given by the + "system-event-listener-class" element. + + + + + + + + + + + + + + + This type contains the recognized versions of + faces-config supported. + + + + + + + + + + + Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-= facesconfig_2_0.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/FilePathEncoderFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/FilePathEncoderFactory.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/FilePathEncoderFactory.java 2009-09-25 12:55:12 UTC (rev 17734) @@ -0,0 +1,60 @@ +/*************************************************************************= ****** + * 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 org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.common.model.plugin.ModelPlugin; +import org.jboss.tools.common.model.project.ModelNatureExtension; +import org.jboss.tools.common.model.util.ModelFeatureFactory; + +public class FilePathEncoderFactory { + static IFilePathEncoder pathEncoderInstance; + + public static IFilePathEncoder getPathEncoder (String pathEncoder) { + if(pathEncoderInstance !=3D null) { + return pathEncoderInstance; + } + if(pathEncoder =3D=3D null) { + return null; + } + if(pathEncoder.length() =3D=3D 0) { + pathEncoder =3D null; + return null; + } + try { + pathEncoderInstance =3D (IFilePathEncoder)ModelFeatureFactory.getInstan= ce().createFeatureInstance(pathEncoder); + } catch (ClassCastException e) { + ModelPlugin.getPluginLog().logError(e); + } finally { + pathEncoder =3D null; + } + return pathEncoderInstance; + } + + + public static IFilePathEncoder getEncoder(IProject project) { + if(project =3D=3D null || !project.isOpen()) return null; + ModelNatureExtension[] es =3D ModelNatureExtension.getInstances(); + for (int i =3D 0; i < es.length; i++) { + try { + if(project.hasNature(es[i].getName())) { + IFilePathEncoder encoder =3D getPathEncoder(es[i].getPathEncoder()); + if(encoder !=3D null) return encoder; + } + } catch (CoreException e) { + //ignore - all checks are done above + } + } + return null; + } + +} Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/IFilePathEncoder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/IFilePathEncoder.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/IFilePathEncoder.java 2009-09-25 12:55:12 UTC (rev 17734) @@ -0,0 +1,37 @@ +/*************************************************************************= ****** + * 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.Properties; + +import org.jboss.tools.common.model.XModelObject; + +public interface IFilePathEncoder { + public static String PATH_TYPE =3D "pathType"; //$NON-NLS-1$ + public static String PATH_ADDITION =3D "pathAddition"; //$NON-NLS-1$ + = + public static String ABSOLUTE_PATH =3D "absolute"; //$NON-NLS-1$ + public static String RELATIVE_PATH =3D "relative"; //$NON-NLS-1$ + = + /** + * Returns path that should be inserted to jsp page. + * = + * @path file path relative to WebContent + */ + public String encode(String path, XModelObject f, String tag, VpeTaglibMa= nager taglibs, Properties context); + = + /** + * Returns file path relative to WebContent + * = + * @path value on jsp page + */ + public String decode(String path, XModelObject f, String tag, VpeTaglibMa= nager taglibs, Properties context); +} --===============1802897165467310706==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 08:59:24 2009 Content-Type: multipart/mixed; boundary="===============8140941463824686750==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17735 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld. Date: Fri, 25 Sep 2009 08:59:24 -0400 Message-ID: <200909251259.n8PCxORo008017@svn01.web.mwc.hst.phx2.redhat.com> --===============8140941463824686750== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 08:59:24 -0400 (Fri, 25 Sep 2009) New Revision: 17735 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/VpeTaglibListener.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/VpeTaglibManager.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/VpeTaglibManagerProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/VpeTaglibListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/VpeTaglibListener.java 2009-09-25 12:55:12 UTC (rev 17734) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/VpeTaglibListener.java 2009-09-25 12:59:24 UTC (rev 17735) @@ -1,17 +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; - -public interface VpeTaglibListener { - void taglibPrefixChanged(String[] prefixs); - void addTaglib(String uri, String prefix); - void removeTaglib(String uri, String prefix); -} \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/VpeTaglibManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/VpeTaglibManager.java 2009-09-25 12:55:12 UTC (rev 17734) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/VpeTaglibManager.java 2009-09-25 12:59:24 UTC (rev 17735) @@ -1,45 +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.List; -import org.w3c.dom.Node; - - -/** - * @author Igels - */ -public interface VpeTaglibManager { - - /** - * Add Taglib Listener to manager - * @param listener - */ - public void addTaglibListener(VpeTaglibListener listener); - - /** - * Remove Taglib Listener from manager - * @param listener - */ - public void removeTaglibListener(VpeTaglibListener listener); - - /** - * Return List of TaglibData(s) where keys are prefixes of TLD. - * @return - */ - public List getTagLibs(); - = - /** - * Sets node in scope of which we should show content assistent - * @param node - */ - public void setReferenceNode(Node node); -} \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/VpeTaglibManagerProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/VpeTaglibManagerProvider.java 2009-09-25 12:55:12 UTC (rev 17734) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/VpeTaglibManagerProvider.java 2009-09-25 12:59:24 UTC (rev 17735) @@ -1,24 +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; - - -/** - * @author Igels - */ -public interface VpeTaglibManagerProvider { - - /** - * Returns Taglib manager. - * @return Taglib manager. - */ - public VpeTaglibManager getTaglibManager(); -} \ No newline at end of file --===============8140941463824686750==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 09:00:12 2009 Content-Type: multipart/mixed; boundary="===============5036227448781611696==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17736 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld. Date: Fri, 25 Sep 2009 09:00:09 -0400 Message-ID: <200909251300.n8PD09eq008264@svn01.web.mwc.hst.phx2.redhat.com> --===============5036227448781611696== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 09:00:09 -0400 (Fri, 25 Sep 2009) New Revision: 17736 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/VpeTaglibListener.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/VpeTaglibManager.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/VpeTaglibManagerProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/VpeTaglibListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/VpeTaglibListener.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/VpeTaglibListener.java 2009-09-25 13:00:09 UTC (rev 17736) @@ -0,0 +1,17 @@ +/*************************************************************************= ****** + * 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; + +public interface VpeTaglibListener { + void taglibPrefixChanged(String[] prefixs); + void addTaglib(String uri, String prefix); + void removeTaglib(String uri, String prefix); +} \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/VpeTaglibManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/VpeTaglibManager.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/VpeTaglibManager.java 2009-09-25 13:00:09 UTC (rev 17736) @@ -0,0 +1,45 @@ +/*************************************************************************= ****** + * 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.w3c.dom.Node; + + +/** + * @author Igels + */ +public interface VpeTaglibManager { + + /** + * Add Taglib Listener to manager + * @param listener + */ + public void addTaglibListener(VpeTaglibListener listener); + + /** + * Remove Taglib Listener from manager + * @param listener + */ + public void removeTaglibListener(VpeTaglibListener listener); + + /** + * Return List of TaglibData(s) where keys are prefixes of TLD. + * @return + */ + public List getTagLibs(); + = + /** + * Sets node in scope of which we should show content assistent + * @param node + */ + public void setReferenceNode(Node node); +} \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/VpeTaglibManagerProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/VpeTaglibManagerProvider.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/VpeTaglibManagerProvider.java 2009-09-25 13:00:09 UTC (rev 17736) @@ -0,0 +1,24 @@ +/*************************************************************************= ****** + * 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; + + +/** + * @author Igels + */ +public interface VpeTaglibManagerProvider { + + /** + * Returns Taglib manager. + * @return Taglib manager. + */ + public VpeTaglibManager getTaglibManager(); +} \ No newline at end of file --===============5036227448781611696==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 09:14:33 2009 Content-Type: multipart/mixed; boundary="===============1434806473865267961==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17737 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF. Date: Fri, 25 Sep 2009 09:14:33 -0400 Message-ID: <200909251314.n8PDEXRE012539@svn01.web.mwc.hst.phx2.redhat.com> --===============1434806473865267961== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-0= 9-25 13:00:09 UTC (rev 17736) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-0= 9-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, --===============1434806473865267961==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 09:17:28 2009 Content-Type: multipart/mixed; boundary="===============8825319785908597448==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17738 - trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF. Date: Fri, 25 Sep 2009 09:17:28 -0400 Message-ID: <200909251317.n8PDHSYr013324@svn01.web.mwc.hst.phx2.redhat.com> --===============8825319785908597448== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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, --===============8825319785908597448==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 09:19:10 2009 Content-Type: multipart/mixed; boundary="===============7083075589760644474==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17739 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF. Date: Fri, 25 Sep 2009 09:19:10 -0400 Message-ID: <200909251319.n8PDJAb4013585@svn01.web.mwc.hst.phx2.redhat.com> --===============7083075589760644474== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/M= ANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFES= T.MF 2009-09-25 13:17:28 UTC (rev 17738) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFES= T.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, --===============7083075589760644474==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 09:45:59 2009 Content-Type: multipart/mixed; boundary="===============5019758874520264382==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17740 - trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view. Date: Fri, 25 Sep 2009 09:45:58 -0400 Message-ID: <200909251345.n8PDjwoQ019205@svn01.web.mwc.hst.phx2.redhat.com> --===============5019758874520264382== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/vi= ew/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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/v= iew/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/v= iew/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 =3D createCssPropertyPage(); + + if (page !=3D null) { + return new PageRec(part, page); + } + + return null; + } + + private IPage createCssPropertyPage() { + IPropertySheetPage page =3D 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)) --===============5019758874520264382==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 10:06:00 2009 Content-Type: multipart/mixed; boundary="===============2282054094471944678==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17741 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld. Date: Fri, 25 Sep 2009 10:06:00 -0400 Message-ID: <200909251406.n8PE60V4022919@svn01.web.mwc.hst.phx2.redhat.com> --===============2282054094471944678== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/js= t/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/to= ols/jst/web/tld/TaglibData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/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/j= st/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 =3D id; - this.uri =3D uri; - this.prefix =3D prefix; - this.ns =3D ns; - } - - public TaglibData(int id, String uri, String prefix) { - this.id =3D id; - this.uri =3D uri; - this.prefix =3D prefix; - this.ns =3D 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 =3D=3D another || - uri.equals(another.getUri()) && prefix.equals(another.getPrefix()); - } - - public boolean inList(List taglibs) { - if (taglibs =3D=3D null) { - return false; - } - Iterator iter =3D taglibs.iterator(); - while (iter.hasNext()) { - if (isEquals((TaglibData)iter.next())) { - return true; - } - } - return false; - } -} \ No newline at end of file --===============2282054094471944678==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 10:07:02 2009 Content-Type: multipart/mixed; boundary="===============5313062584064323831==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17742 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld. Date: Fri, 25 Sep 2009 10:07:02 -0400 Message-ID: <200909251407.n8PE7226023106@svn01.web.mwc.hst.phx2.redhat.com> --===============5313062584064323831== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/tl= d/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/we= b/tld/TaglibData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/TaglibData.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/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 =3D id; + this.uri =3D uri; + this.prefix =3D prefix; + this.ns =3D ns; + } + + public TaglibData(int id, String uri, String prefix) { + this.id =3D id; + this.uri =3D uri; + this.prefix =3D prefix; + this.ns =3D 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 =3D=3D another || + uri.equals(another.getUri()) && prefix.equals(another.getPrefix()); + } + + public boolean inList(List taglibs) { + if (taglibs =3D=3D null) { + return false; + } + Iterator iter =3D taglibs.iterator(); + while (iter.hasNext()) { + if (isEquals((TaglibData)iter.next())) { + return true; + } + } + return false; + } +} \ No newline at end of file --===============5313062584064323831==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 10:07:46 2009 Content-Type: multipart/mixed; boundary="===============5869057019213227756==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] 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. Date: Fri, 25 Sep 2009 10:07:45 -0400 Message-ID: <200909251407.n8PE7jhd023220@svn01.web.mwc.hst.phx2.redhat.com> --===============5869057019213227756== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/vp= e/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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/v= pe/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/v= pe/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 =3D 0; i < children.getLength(); i++) { Node child =3D children.item(i); String sourcePrefix =3D child.getPrefix(); - List taglibs =3D XmlUtil.getTaglibsForNode(sourceNode, - pageContext); - TaglibData sourceNodeTaglib =3D XmlUtil.getTaglibForPrefix( - sourcePrefix, taglibs); - if (null !=3D sourceNodeTaglib) { - String sourceNodeUri =3D sourceNodeTaglib.getUri(); + if (XmlUtil.hasTaglib(sourceNode, pageContext, sourcePrefix)) { + String sourceNodeUri =3D XmlUtil.getTaglibUri(sourceNode, pageContext, s= ourcePrefix); if ((child.getNodeType() =3D=3D Node.ELEMENT_NODE) && (VisualDomUtil.JSF_CORE_URI.equalsIgnoreCase(sourceNodeUri) || VisualDomUtil.JSF_HTML_URI.equalsIgnoreCase(sourceNodeUri) --===============5869057019213227756==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 10:08:33 2009 Content-Type: multipart/mixed; boundary="===============8088597126530560709==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17744 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/util and 1 other directory. Date: Fri, 25 Sep 2009 10:08:33 -0400 Message-ID: <200909251408.n8PE8XHj023339@svn01.web.mwc.hst.phx2.redhat.com> --===============8088597126530560709== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/uti= l/XmlUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-09-25 1= 4:07:44 UTC (rev 17743) +++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-09-25 1= 4: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:=3Dreexport, 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/edi= tor/util/XmlUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/XmlUtil.java 2009-09-25 14:07:44 UTC (rev 17743) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/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 taglibs =3D XmlUtil.getTaglibsForNode(sourceNode, + pageContext); + TaglibData sourceNodeTaglib =3D XmlUtil.getTaglibForPrefix( + sourcePrefix, taglibs); + return sourceNodeTaglib !=3D null; + } + + //helper method + public static String getTaglibUri(Node sourceNode, + VpePageContext pageContext, String sourcePrefix) { + List taglibs =3D XmlUtil.getTaglibsForNode(sourceNode, + pageContext); + TaglibData sourceNodeTaglib =3D XmlUtil.getTaglibForPrefix( + sourcePrefix, taglibs); + return sourceNodeTaglib =3D=3D null ? null : sourceNodeTaglib.getUri(); + } + /** * Processes taglib attribute * @param taglibs --===============8088597126530560709==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 10:31:56 2009 Content-Type: multipart/mixed; boundary="===============2473170856975276014==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17745 - in trunk/cdi/plugins/org.jboss.tools.cdi.core: src/org/jboss/tools/cdi/core and 1 other directory. Date: Fri, 25 Sep 2009 10:31:56 -0400 Message-ID: <200909251431.n8PEVu1X028064@svn01.web.mwc.hst.phx2.redhat.com> --===============2473170856975276014== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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:=3Dtrue 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=3D"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/c= ore/IBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/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/c= ore/IBeanManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 getBeans(String name); + + /** + * Returns the set of beans which match the given required type and bi= ndings. + * = + * @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 @C= urrent + * is assumed. + * @return the matched beans + */ + public Set getBeans(IType beanType, IAnnotation... bindings); + +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jbo= ss/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/c= ore/ICDIProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/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/c= ore/IInject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/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/c= ore/INamed.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/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/c= ore/IProduces.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/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/c= ore/IQualifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/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/c= ore/IScope.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/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/c= ore/IStereotype.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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/jbo= ss/tools/cdi/core/IStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============2473170856975276014==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 10:58:27 2009 Content-Type: multipart/mixed; boundary="===============3451984990313607777==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17746 - trunk/jst/plugins. Date: Fri, 25 Sep 2009 10:58:27 -0400 Message-ID: <200909251458.n8PEwR5T032316@svn01.web.mwc.hst.phx2.redhat.com> --===============3451984990313607777== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 10:58:27 -0400 (Fri, 25 Sep 2009) New Revision: 17746 Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/ Log: Share project "org.jboss.tools.jst.text.ext" into "https://svn.jboss.org/re= pos/jbosstools" --===============3451984990313607777==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:01:55 2009 Content-Type: multipart/mixed; boundary="===============7795737015283084047==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17747 - in trunk/jst/plugins/org.jboss.tools.jst.text.ext: .settings and 11 other directories. Date: Fri, 25 Sep 2009 11:01:55 -0400 Message-ID: <200909251501.n8PF1tc7000596@svn01.web.mwc.hst.phx2.redhat.com> --===============7795737015283084047== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:01:55 -0400 (Fri, 25 Sep 2009) New Revision: 17747 Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath trunk/jst/plugins/org.jboss.tools.jst.text.ext/.cvsignore trunk/jst/plugins/org.jboss.tools.jst.text.ext/.options.template trunk/jst/plugins/org.jboss.tools.jst.text.ext/.project trunk/jst/plugins/org.jboss.tools.jst.text.ext/.ruleset trunk/jst/plugins/org.jboss.tools.jst.text.ext/.settings/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.settings/org.eclipse.jdt= .core.prefs trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.text.ext/about.html trunk/jst/plugins/org.jboss.tools.jst.text.ext/build.properties trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.properties trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin_ja.properties trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/JSTExtensionsPlugin.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/CSSClassHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/CSSClassHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/FilterNameHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/RoleNameHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/ServletNameHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/TLDAttributeNameHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPClassHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPElementAttributeValueHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPElementHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPElementNameHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPElementNameHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPForBeanIdHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPRelativeLinkHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPTagAttributeHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPTagAttributeValueHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPTaglibHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPTaglibHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPTextHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPXmlNsHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPXmlNsHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/util/ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/util/CSSTextScanner.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/util/TaglibManagerWrapper.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath 2009-09-25 15= :01:55 UTC (rev 17747) @@ -0,0 +1,7 @@ + + + + + + + Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classp= ath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.cvsignore =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/.cvsignore = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.cvsignore 2009-09-25 15= :01:55 UTC (rev 17747) @@ -0,0 +1 @@ +bin Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.cvsign= ore ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.options.template =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/.options.template = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.options.template 2009-0= 9-25 15:01:55 UTC (rev 17747) @@ -0,0 +1 @@ +org.jboss.tools.jsf.text.ext/debug=3Dfalse \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/.project = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.project 2009-09-25 15:0= 1:55 UTC (rev 17747) @@ -0,0 +1,34 @@ + + + org.jboss.tools.jst.text.ext + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + net.sourceforge.pmd.runtime.pmdBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + net.sourceforge.pmd.runtime.pmdNature + + Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.ruleset =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/.ruleset = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.ruleset 2009-09-25 15:0= 1:55 UTC (rev 17747) @@ -0,0 +1,17 @@ + + + + + +1 + + + + + + + + + + Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.settings/org.eclipse= .jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/.settings/org.eclipse.jd= t.core.prefs (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.settings/org.eclipse.jd= t.core.prefs 2009-09-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,9 @@ +#Fri Sep 25 18:49:45 GMT+03:00 2009 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=3Dwarni= ng +org.eclipse.jdt.core.compiler.source=3D1.5 Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.settin= gs/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 200= 9-09-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,31 @@ +Manifest-Version: 1.0 +Eclipse-LazyStart: true +Bundle-Activator: org.jboss.tools.jst.text.ext.JSTExtensionsPlugin +Export-Package: org.jboss.tools.jst.text.ext, + org.jboss.tools.jst.text.ext.hyperlink, + org.jboss.tools.jst.text.ext.hyperlink.jsp, + org.jboss.tools.jst.text.ext.util +Bundle-Version: 2.0.0 +Bundle-Name: %Bundle-Name.0 +Bundle-ManifestVersion: 2 +Bundle-Vendor: %providerName +Plugin-Class: org.jboss.tools.jst.text.ext.JSTExtensionsPlugin +Bundle-SymbolicName: org.jboss.tools.jst.text.ext;singleton:=3Dtrue +Bundle-Localization: plugin +Require-Bundle: org.jboss.tools.common.model, + org.jboss.tools.common.text.ext, + org.eclipse.ui.ide, + org.eclipse.ui, + org.eclipse.jface.text, + org.eclipse.ui.workbench.texteditor, + org.eclipse.jdt.ui, + org.eclipse.wst.sse.core;visibility:=3Dreexport, + org.eclipse.wst.sse.ui;visibility:=3Dreexport, + org.eclipse.jst.jsp.core;visibility:=3Dreexport, + org.eclipse.wst.common.modulecore;visibility:=3Dreexport, + org.eclipse.pde.ui, + org.jboss.tools.common.el.core;bundle-version=3D"2.0.0", + org.eclipse.emf.ecore;bundle-version=3D"2.5.0", + org.eclipse.wst.css.core, + org.eclipse.wst.html.core +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-IN= F/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/about.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/about.html = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/about.html 2009-09-25 15= :01:55 UTC (rev 17747) @@ -0,0 +1,34 @@ + + + + +About + + + + + +

About This Content

+ +

License

+ +

Red Hat Inc., through its JBoss division, makes available all content i= n this plug-in = +("Content"). Unless otherwise indicated below, the Content is provided to = you = +under the terms and conditions of the Eclipse Public License Version 1.0 = +("EPL"). A copy of the EPL is available at +http://www.ec= lipse.org/org/documents/epl-v10.php. = +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from Red Hat Inc., the = +Content is being redistributed by another party ("Redistributor") and diff= erent = +terms and conditions may apply to your use of any object code in the Conte= nt. = +Check the Redistributor's license that was provided with the Content. If n= o such = +license exists, contact the Redistributor. Unless otherwise indicated belo= w, the = +terms and conditions of the EPL still apply to any source code in the Cont= ent = +and such source code may be obtained at + http://www.jboss.org/tools. + + + \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/about.h= tml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/build.properties = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/build.properties 2009-09= -25 15:01:55 UTC (rev 17747) @@ -0,0 +1,10 @@ +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ +bin.includes =3D .,\ + plugin.xml,\ + plugin.properties,\ + META-INF/,\ + about.html +src.includes =3D src/,\ + plugin.xml Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/build.p= roperties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.properties = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.properties 2009-0= 9-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,3 @@ +providerName=3DJBoss by Red Hat + +Bundle-Name.0 =3D Text Editors Extensions \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.= properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2009-09-25 15= :01:55 UTC (rev 17747) @@ -0,0 +1,5 @@ + + + + + Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.= xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin_ja.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin_ja.properties = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin_ja.properties 200= 9-09-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,2 @@ +providerName=3DJBoss by Red Hat +Bundle-Name.0=3D\u30C6\u30AD\u30B9\u30C8\u30FB\u30A8\u30C7\u30A3\u30BF\u30= FC\u62E1\u5F35 Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin_= ja.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/JSTExtensionsPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/JSTExtensionsPlugin.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/JSTExtensionsPlugin.java 2009-09-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,64 @@ +/*************************************************************************= ****** + * 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.text.ext; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPluginDescriptor; +import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; +import org.jboss.tools.common.log.BaseUIPlugin; +import org.jboss.tools.common.log.IPluginLog; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; +import org.osgi.framework.BundleContext; + + +/** + * @author Jeremy + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class JSTExtensionsPlugin extends BaseUIPlugin implements IAdaptabl= e { + //The shared instance. + private static JSTExtensionsPlugin plugin; + = + public static final String PLUGIN_ID =3D "org.jboss.tools.common.text.ext= "; //$NON-NLS-1$ + + /** + * The constructor. + */ + public JSTExtensionsPlugin() { + super(); + plugin =3D this; + } + + /** + * Returns the shared instance. + */ + public static JSTExtensionsPlugin getDefault() { + return plugin; + } + + public Object getAdapter(Class adapter) { + if (adapter =3D=3D IHyperlinkDetector.class) { + return HyperlinkDetector.getInstance(); + } + return null; + } + + = + /** + * @return IPluginLog object + */ + public static IPluginLog getPluginLog() { + return getDefault(); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/JSTExtensionsPlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/CSSClassHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/CSSClassHyperlink.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/CSSClassHyperlink.java 2009-09-25 15:01:55 UTC (rev 1774= 7) @@ -0,0 +1,509 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.ide.IDE; +import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvid= eAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetA= dapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRul= e; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleShe= et; +import org.eclipse.wst.html.core.internal.htmlcss.LinkElementAdapter; +import org.eclipse.wst.html.core.internal.htmlcss.URLModelProvider; +import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.RegionHolder; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.css.CSSRule; +import org.w3c.dom.css.CSSRuleList; +import org.w3c.dom.css.CSSStyleSheet; + +/** + * @author Jeremy + */ +public class CSSClassHyperlink extends AbstractHyperlink { + + public static final String[] STYLE_TAGS =3D new String[] { "style", "link= " }; //$NON-NLS-1$//$NON-NLS-2$ + public static final String LINK_TAG =3D "link"; //$NON-NLS-1$ + public static final String HREF_ATTRIBUTE =3D "href"; //$NON-NLS-1$ + public static final String COMPARE_CLASS_REGEX_PREFIX =3D "[\\.]?"; //$NO= N-NLS-1$ + public static final String CONTEXT_PATH_EXPRESSION =3D "^\\s*(\\#|\\$)\\{= facesContext.externalContext.requestContextPath\\}"; //$NON-NLS-1$ + + /** + * = + */ + protected void doHyperlink(IRegion region) { + + IDOMModel model =3D (IDOMModel) getModelManager() + .getExistingModelForRead(getDocument()); + + // get name of looked for style + String styleName =3D getStyleName(region); + + // get elements which copntans information about styles (style and link + // tags) + List styleElementList =3D getStyleContainerList(model); + + // sort nodes by position in inverse order - from larger position to + // smaller + Collections.sort(styleElementList, new Comparator() { + + public int compare(Node o1, Node o2) { + return ((IDOMNode) o2).getStartOffset() + - ((IDOMNode) o1).getStartOffset(); + } + + }); + + RegionHolder styleRegion =3D null; + // look for style in each Style element + for (Node styleContainer : styleElementList) { + + styleRegion =3D findStyleRegion(styleContainer, styleName); + + if (styleRegion !=3D null) { + showRegion(styleRegion); + break; + } + + } + + model.releaseFromRead(); + } + + /** + * = + * @param model + * @return + */ + private List getStyleContainerList(IDOMModel model) { + + // get model of current page + IDOMDocument document =3D model.getDocument(); + + List getStyleContainerList =3D new ArrayList(); + + // get all tags which contains style ( link, style) + for (String tagName : STYLE_TAGS) { + getStyleContainerList.addAll(getList(document + .getElementsByTagName(tagName))); + } + + return getStyleContainerList; + } + + /** + * move nodes from NodeList to List + * = + * @param nodeList + * @return + */ + List getList(NodeList nodeList) { + + List newContainerList =3D new ArrayList(); + for (int i =3D 0; i < nodeList.getLength(); i++) { + newContainerList.add(nodeList.item(i)); + } + return newContainerList; + } + + /** + * = + * @param stylesContainer + * @param styleName + * @return + */ + public RegionHolder findStyleRegion(Node stylesContainer, String styleNam= e) { + + // get style sheet + CSSStyleSheet sheet =3D getSheet(stylesContainer); + + if (sheet !=3D null) { + + CSSRuleList ruleList =3D sheet.getCssRules(); + + // for each cssRule + for (int i =3D 0; i < ruleList.getLength(); i++) { + + CSSRule cssRule =3D ruleList.item(i); + + // if cssRule describe looked for style + if (isRuleMatch(cssRule, styleName)) { + + return new RegionHolder(getFile((ICSSNode) cssRule), + getRegion(cssRule)); + + } + } + + } + return null; + } + + /** + * = + * @param stylesContainer + * @return + */ + private CSSStyleSheet getSheet(final Node stylesContainer) { + + INodeNotifier notifier =3D (INodeNotifier) stylesContainer; + + IStyleSheetAdapter adapter =3D (IStyleSheetAdapter) notifier + .getAdapterFor(IStyleSheetAdapter.class); + + if (LINK_TAG.equalsIgnoreCase(stylesContainer.getNodeName()) + && !(adapter instanceof ExtendedLinkElementAdapter)) { + + notifier.removeAdapter(adapter); + adapter =3D new ExtendedLinkElementAdapter( + (Element) stylesContainer); + notifier.addAdapter(adapter); + + } + + CSSStyleSheet sheet =3D null; + + if (adapter !=3D null) { + sheet =3D (CSSStyleSheet) adapter.getSheet(); + + } + + return sheet; + + } + + protected String processURL(String href) { + // TODO Auto-generated method stub + return null; + } + + /** + * = + * @param cssRule + * @param styleName + * @return + */ + private boolean isRuleMatch(CSSRule cssRule, String styleName) { + + // get selector text + String selectorText =3D ((ICSSStyleRule) cssRule).getSelectorText(); + + if (selectorText !=3D null) { + + // split selector text by whitespace + String[] styles =3D selectorText.trim().split(" "); //$NON-NLS-1$ + int searchIndex =3D Arrays.binarySearch(styles, styleName, + new Comparator() { + + public int compare(String o1, String o2) { + Matcher matcher =3D Pattern.compile( + COMPARE_CLASS_REGEX_PREFIX + o2) + .matcher(o1); + return matcher.matches() ? 0 : 1; + } + + }); + if (searchIndex >=3D 0) + return true; + } + return false; + } + + /** + * = + * @param node + * @return + */ + private IFile getFile(ICSSNode node) { + + ICSSDocument sheet =3D node.getOwnerDocument(); + + return AbstractHyperlink.getFile(sheet.getModel()); + } + + /** + * = + * @param cssRule + * @return + */ + protected Region getRegion(CSSRule cssRule) { + + int offset =3D ((IndexedRegion) cssRule).getStartOffset(); + + // if css rule is contained in style tag so it is require to take into + // account offset of this tag + ICSSStyleSheet document =3D (ICSSStyleSheet) ((ICSSStyleRule) cssRule) + .getOwnerDocument(); + + ICSSModel model =3D document.getModel(); + + // get style tag + Node node =3D model.getOwnerDOMNode(); + + // increase offset + if (node instanceof IDOMElement) + offset +=3D ((IDOMElement) node).getStartEndOffset(); + + return new Region(offset, 0); + + } + + /** + * = + * @param styleRegion + */ + private void showRegion(RegionHolder styleRegion) { + + IWorkbenchPage workbenchPage =3D ExtensionsPlugin.getDefault() + .getWorkbench().getActiveWorkbenchWindow().getActivePage(); + IEditorPart part =3D null; + if (styleRegion.file !=3D null) { + try { + part =3D IDE.openEditor(workbenchPage, styleRegion.file, true); + } catch (PartInitException e) { + e.printStackTrace(); + } + if (part =3D=3D null) { + openFileFailed(); + return; + } + } + StructuredSelectionHelper.setSelectionAndReveal(part, + styleRegion.region); + } + + /** + * = + * @param region + * @return + */ + private String getStyleName(IRegion region) { + try { + return getDocument().get(region.getOffset(), region.getLength()); + } catch (BadLocationException e) { + return null; + } + } + + IRegion fLastRegion =3D null; + + /** + * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) + */ + protected IRegion doGetHyperlinkRegion(int offset) { + fLastRegion =3D getRegion(offset); + return fLastRegion; + } + + /** + * TODO research method + * = + * @param offset + * @return + */ + protected IRegion getRegion(int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) + return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + + if (n =3D=3D null || !(n instanceof Attr)) + return null; + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if (start > offset) + return null; + + String attrText =3D getDocument().get(start, end - start); + + StringBuffer sb =3D new StringBuffer(attrText); + // find start of bean property + int bStart =3D offset - start; + while (bStart >=3D 0) { + if (!Character.isJavaIdentifierPart(sb.charAt(bStart)) + && sb.charAt(bStart) !=3D '_' && sb.charAt(bStart) !=3D '-' + && sb.charAt(bStart) !=3D '.') { + bStart++; + break; + } + + if (bStart =3D=3D 0) + break; + bStart--; + } + // find end of bean property + int bEnd =3D offset - start; + while (bEnd < sb.length()) { + if (!Character.isJavaIdentifierPart(sb.charAt(bEnd)) + && sb.charAt(bEnd) !=3D '_' && sb.charAt(bEnd) !=3D '-' + && sb.charAt(bEnd) !=3D '.') + break; + bEnd++; + } + + final int propStart =3D bStart + start; + final int propLength =3D bEnd - bStart; + + if (propStart > offset || propStart + propLength < offset) + return null; + return new Region(propStart, propLength); + } catch (BadLocationException x) { + // ignore + return null; + } finally { + smw.dispose(); + } + } + + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String styleName =3D getStyleName(fLastRegion); + if (styleName =3D=3D null) + return MessageFormat.format(Messages.OpenA, Messages.CSSStyle); + + return MessageFormat.format(Messages.OpenCSSStyle, styleName); + } + + @Override + protected String findAndReplaceElVariable(String fileName) { + if (fileName !=3D null) + fileName =3D fileName + .replaceFirst( + "^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\= }", + ""); + return super.findAndReplaceElVariable(fileName); + } + + public class ExtendedLinkElementAdapter extends LinkElementAdapter { + + private Element element; + + public ExtendedLinkElementAdapter(Element element) { + this.element =3D element; + } + + @Override + public Element getElement() { + return element; + } + + @Override + protected boolean isValidAttribute() { + String href =3D getElement().getAttribute(HREF_ATTRIBUTE); + if (href =3D=3D null || href.length() =3D=3D 0) + return false; + return true; + } + + /** + */ + public ICSSModel getModel() { + ICSSModel model =3D super.getModel(); + if (model =3D=3D null) { + model =3D retrieveModel(); + setModel(model); + } + return model; + } + + /** + */ + private ICSSModel retrieveModel() { + if (!isValidAttribute()) { + return null; + } + + // null,attr check is done in isValidAttribute() + Element element =3D getElement(); + String href =3D findAndReplaceElVariable(element + .getAttribute(HREF_ATTRIBUTE)); + + IDOMModel baseModel =3D ((IDOMNode) element).getModel(); + if (baseModel =3D=3D null) + return null; + Object id =3D baseModel.getId(); + if (!(id instanceof String)) + return null; + // String base =3D (String)id; + + // get ModelProvideAdapter + IModelProvideAdapter adapter =3D (IModelProvideAdapter) ((INodeNotifier= ) getElement()) + .getAdapterFor(IModelProvideAdapter.class); + + URLModelProvider provider =3D new URLModelProvider(); + try { + IStructuredModel newModel =3D provider.getModelForRead(baseModel, + href); + if (newModel =3D=3D null) + return null; + if (!(newModel instanceof ICSSModel)) { + newModel.releaseFromRead(); + return null; + } + + // notify adapter + if (adapter !=3D null) + adapter.modelProvided(newModel); + + return (ICSSModel) newModel; + } catch (UnsupportedEncodingException e) { + } catch (IOException e) { + } + + return null; + } + } + +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/CSSClassHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/CSSClassHyperlinkPartitioner.java 2009-09-25 15:01:55 UT= C (rev 17747) @@ -0,0 +1,84 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jst.text.ext.hyperlink; + +import org.eclipse.jface.text.IDocument; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +/** + * = + * @author Sergey Dzmitrovich + * + */ +public class CSSClassHyperlinkPartitioner extends + AbstractHyperlinkPartitioner implements IHyperlinkPartitionRecognizer { + + public static final String CSS_CLASS_PARTITION =3D "org.jboss.tools.commo= n.text.ext.CSS_CLASS"; //$NON-NLS-1$ + + private static final String CSS_CLASS_TOKEN =3D "class/"; //$NON-NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, + * com.ibm.sse.editor.extensions.hyperlink.IHyperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, + IHyperlinkRegion superRegion) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) + return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, superRegion + .getOffset()); + if (n =3D=3D null || !(n instanceof Attr)) + return null; + + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D getPartitionType(axis); + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if (start < 0 || end < start) + return null; + int length =3D end - start; + int offset =3D superRegion.getOffset(); + + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, + contentType, type); + return region; + } finally { + smw.dispose(); + } + } + + private String getPartitionType(String axis) { + return CSS_CLASS_PARTITION; + } + + public boolean recognize(IDocument document, IHyperlinkRegion region) { + + if (region.getAxis() !=3D null + && region.getAxis().toLowerCase().endsWith(CSS_CLASS_TOKEN)) + return true; + return false; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/FilterNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/FilterNameHyperlink.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/FilterNameHyperlink.java 2009-09-25 15:01:55 UTC (rev 17= 747) @@ -0,0 +1,35 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink; + +import org.jboss.tools.common.text.ext.hyperlink.JumpToHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +/** + * @author Jeremy + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class FilterNameHyperlink extends JumpToHyperlink { + protected String getDestinationAxis() { + return "/web-app/filter/filter-name/"; //$NON-NLS-1$ + } + = + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToFilterNameDefinition; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/FilterNameHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java 2009-09-25 15:01:55 U= TC (rev 17747) @@ -0,0 +1,110 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; + +import org.jboss.tools.common.text.ext.hyperlink.RelativeLinkHyperlink; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * @author Jeremy + * + */ +public class JSPStylesheetRelLinkHyperlink extends RelativeLinkHyperlink { + = + private static final String HREF_ATTRNAME =3D "href"; //$NON-NLS-1$ + + protected IRegion getRegion (int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(getDocument()); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + = + if (n =3D=3D null || !(n instanceof Text || n instanceof Attr)) return = null; + = + String text =3D null; + int bStart =3D 0; + int bEnd =3D 0; + = + if (n instanceof Text) { + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if (start < 0 || start > offset) return null; + = + text =3D getDocument().get(start, end - start); + bStart =3D offset - start; + bEnd =3D offset - start; + } else if (n instanceof Attr) { + Attr attr =3D (Attr)n; + if (!HREF_ATTRNAME.equalsIgnoreCase(attr.getName())) return null; + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if(start < 0) return null; + = + text =3D getDocument().get(start, end - start); + bStart =3D offset - start; + bEnd =3D offset - start; + } + StringBuffer sb =3D new StringBuffer(text); + //find start of bean property + while (bStart >=3D 0) { = + if (!Character.isJavaIdentifierPart(sb.charAt(bStart)) && + sb.charAt(bStart) !=3D '\\' && sb.charAt(bStart) !=3D '/' && + sb.charAt(bStart) !=3D ':' && sb.charAt(bStart) !=3D '-' && + sb.charAt(bStart) !=3D '.' && sb.charAt(bStart) !=3D '_' && + sb.charAt(bStart) !=3D '%' && sb.charAt(bStart) !=3D '?' && + sb.charAt(bStart) !=3D '&' && sb.charAt(bStart) !=3D '=3D') { + bStart++; + break; + } + = + if (bStart =3D=3D 0) break; + bStart--; + } + // find end of bean property + while (bEnd >=3D 0 && bEnd < sb.length()) { = + if (!Character.isJavaIdentifierPart(sb.charAt(bEnd)) && + sb.charAt(bEnd) !=3D '\\' && sb.charAt(bEnd) !=3D '/' && + sb.charAt(bEnd) !=3D ':' && sb.charAt(bEnd) !=3D '-' && + sb.charAt(bEnd) !=3D '.' && sb.charAt(bEnd) !=3D '_' && + sb.charAt(bEnd) !=3D '%' && sb.charAt(bEnd) !=3D '?' && + sb.charAt(bEnd) !=3D '&' && sb.charAt(bEnd) !=3D '=3D') { + break; + } + bEnd++; + } + = + final int propStart =3D bStart + Utils.getValueStart(n); + final int propLength =3D bEnd - bStart; + = + if (propStart > offset || propStart + propLength < offset) return null; + = + return new Region(propStart,propLength); + } catch (BadLocationException x) { + //ignore + return null; + } finally { + smw.dispose(); + } + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/RoleNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/RoleNameHyperlink.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/RoleNameHyperlink.java 2009-09-25 15:01:55 UTC (rev 1774= 7) @@ -0,0 +1,37 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink; + +import org.jboss.tools.common.text.ext.hyperlink.JumpToHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; + + +/** + * @author Jeremy + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class RoleNameHyperlink extends JumpToHyperlink { + protected String getDestinationAxis() { + return "/web-app/security-role/role-name/"; //$NON-NLS-1$ + } + = + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToRoleNameDefinition; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/RoleNameHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/ServletNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/ServletNameHyperlink.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/ServletNameHyperlink.java 2009-09-25 15:01:55 UTC (rev 1= 7747) @@ -0,0 +1,37 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink; + +import org.jboss.tools.common.text.ext.hyperlink.JumpToHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; + + +/** + * @author Jeremy + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class ServletNameHyperlink extends JumpToHyperlink { + protected String getDestinationAxis() { + return "/web-app/servlet/servlet-name/"; //$NON-NLS-1$ + } + = + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToServletNameDefinition; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/ServletNameHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/TLDAttributeNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/TLDAttributeNameHyperlink.java (= rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/TLDAttributeNameHyperlink.java 2009-09-25 15:01:55 UTC (= rev 17747) @@ -0,0 +1,90 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink; + +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + +import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.text.ext.hyperlink.JumpToHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * @author Jeremy + * + */ +public class TLDAttributeNameHyperlink extends JumpToHyperlink { + protected String getDestinationAxis() { + return "/taglib/tag/attribute/name/"; //$NON-NLS-1$ + } + = + protected NodeList getRootElementsToSearch (IRegion region) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + + Element tagElement =3D null; + while(n !=3D null && tagElement =3D=3D null) { + n =3D n.getParentNode(); + if (n instanceof Element && validAxis(n, "/taglib/tag/")) { //$NON-NLS= -1$ + tagElement =3D (Element)n; + } + } + if (tagElement =3D=3D null) + return null; + = + return tagElement.getChildNodes(); + } finally { + smw.dispose(); + } + } + = + private boolean validAxis(Node n, String validAxisEnding) { + if (validAxisEnding =3D=3D null || validAxisEnding.lastIndexOf('/') =3D= =3D -1) return false; + StringTokenizer st =3D new StringTokenizer(validAxisEnding, "/"); //$NON= -NLS-1$ + List tokens =3D new ArrayList(); + while (st.hasMoreTokens()) { + tokens.add(st.nextToken()); + } + if (tokens.size() =3D=3D 0) return false; + Node currentElement =3D n; + for (int i =3D tokens.size() - 1; i >=3D 0; i--) { + if (currentElement =3D=3D null || !(currentElement instanceof Element)) + return false; + String token =3D (String)tokens.get(i); + if (!token.equals(currentElement.getNodeName())) + return false; + currentElement =3D currentElement.getParentNode(); + } + return true; + } + + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToTLDAttributeNameDeclaration; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/TLDAttributeNameHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.java 2009-09-2= 5 15:01:55 UTC (rev 17747) @@ -0,0 +1,58 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jst.text.ext.hyperlink; + +import org.eclipse.jface.text.IDocument; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLClassHyperlinkPart= itioner; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLTextHyperlinkParti= tioner; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; + +/** + * @author mareshkau + * + */ +public class TaglibDefinitionFilesHyperlinkPartitioner extends XMLTextHype= rlinkPartitioner { + + public static final String TAGLIB_XML_PARTITION =3D "org.jboss.tools.comm= on.text.ext.xml.TAGLIB_XML"; //$NON-NLS-1$ + /* (non-Javadoc) + * @see org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartit= ioner#parse(org.eclipse.jface.text.IDocument, org.jboss.tools.common.text.e= xt.hyperlink.IHyperlinkRegion) + */ + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + @Override + public boolean recognize(IDocument document, IHyperlinkRegion region) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + return (n instanceof Text); + } finally { + smw.dispose(); + } + } + + @Override + protected String getPartitionType(String axis) { + if(axis!=3Dnull && axis.contains("class")) { //$NON-NLS-1$ + return XMLClassHyperlinkPartitioner.XML_CLASS_PARTITION; + } + return TAGLIB_XML_PARTITION; + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartition= er.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java 2009-09-25 15:01:55= UTC (rev 17747) @@ -0,0 +1,199 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.text.MessageFormat; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IRegion; +import org.eclipse.ui.IEditorPart; +import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * @author Jeremy + * + */ +public class JSPBeanGetPropertyHyperlink extends ClassMethodHyperlink { + private static final String USEBEAN_TAGNAME =3D "jsp:useBean"; //$NON-NLS= -1$ + private static final String ID_ATTRNAME =3D "id"; //$NON-NLS-1$ + private static final String NAME_ATTRNAME =3D "name"; //$NON-NLS-1$ + private static final String CLASS_ATTRNAME =3D "class"; //$NON-NLS-1$ + private static final String TYPE_ATTRNAME =3D "type"; //$NON-NLS-1$ + protected static final String GET_METHOD_PREFIX =3D "get"; //$NON-NLS-1$ + protected static final String SET_METHOD_PREFIX =3D "set"; //$NON-NLS-1$ + + protected String getMethodPrefix() { + return GET_METHOD_PREFIX; + } + = + private String getMethodName(String propertyName) { + String name =3D propertyName.trim(); + // Capitalize first letter of the name + name =3D name.substring(0, 1).toUpperCase() + name.substring(1); + return getMethodPrefix() + name; + } + = + protected String getClassName(IRegion region) { + return null; + } + protected String getMethodName(IRegion region) { + return null; + } + = + /** = + * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jfac= e.text.IRegion) + */ + protected void doHyperlink(IRegion region) { + try { + String beanID =3D getBeanId(region); + String propertyName =3D getPropertyName(region); + = + Element elementByID =3D findElementByIDBackward(beanID, region.getOffse= t(), USEBEAN_TAGNAME); + String className =3D getAttributeValue(elementByID, CLASS_ATTRNAME); + String typeName =3D getAttributeValue(elementByID, TYPE_ATTRNAME); + = + IJavaElement beanMethod =3D null; + if (className !=3D null && className.trim().length() > 0) { + beanMethod =3D searchForClassMethod(className, getMethodName(propertyN= ame)); + } + if (beanMethod =3D=3D null && (typeName !=3D null && typeName.trim().le= ngth() > 0)) { + beanMethod =3D searchForClassMethod(typeName, getMethodName(propertyNa= me)); + } + + if (beanMethod !=3D null) { + IEditorPart part =3D JavaUI.openInEditor(beanMethod); + if (part !=3D null) { + JavaUI.revealInEditor(part, beanMethod); + } + else { + // could not open editor + openFileFailed(); + } + } else { + openFileFailed(); + } + } catch (CoreException x) { + openFileFailed(); + } + } + + private Element findElementByIDBackward (String id, int endOffset, String= tagname) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, endOffset); + + if (n =3D=3D null) return null; + if (n instanceof Attr) n =3D ((Attr)n).getOwnerElement(); + + Element element =3D null; + for (Node parent =3D n;parent !=3D null && element =3D=3D null; parent = =3D parent.getParentNode()) { + element =3D findElementByIDBackward(xmlDocument.getChildNodes(), id, e= ndOffset, tagname); = + } + return element; + } finally { + smw.dispose(); + } + } + = + private Element findElementByIDBackward(NodeList list, String id, int end= Offset, String tagName) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + + for (int i =3D list.getLength() - 1; list !=3D null && i >=3D 0; i--) { + if(!(list.item(i) instanceof Element)) continue; + Element element =3D (Element)list.item(i); + int start =3D Utils.getValueStart(element); + if (start < 0 || start >=3D endOffset) continue; + = + String elementName =3D element.getNodeName(); + if (tagName.equals(elementName)) { + = + Attr idAttr =3D element.getAttributeNode(ID_ATTRNAME); + if (idAttr !=3D null) { + String val =3D Utils.trimQuotes(idAttr.getNodeValue()); + if (id.equals(val)) { + return element; + } + } + } + = + if (element.hasChildNodes()) { + Element child =3D findElementByIDBackward(element.getChildNodes(), i= d, endOffset, tagName); + if (child !=3D null) return child; + } + + } + } finally { + smw.dispose(); + } + return null; + } + + String getPropertyName(IRegion region) { + try { + return Utils.trimQuotes(getDocument().get(region.getOffset(), region.ge= tLength())); + } catch (BadLocationException x) { + //ignore + return null; + } + } + + private String getBeanId(IRegion region) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + + if (n =3D=3D null || !(n instanceof Attr)) return null; + = + Node node =3D ((Attr)n).getOwnerElement(); + + return getAttributeValue(node, NAME_ATTRNAME); + } finally { + smw.dispose(); + } + } + + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName =3D getPropertyName(fLastRegion); + if (propertyName =3D=3D null) + return MessageFormat.format(Messages.OpenA, Messages.Getter); + = + return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Mess= ages.Getter, propertyName); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlinkPartitioner.java 2009-09-= 25 15:01:55 UTC (rev 17747) @@ -0,0 +1,92 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * @author Jeremy + */ +public class JSPBeanGetPropertyHyperlinkPartitioner extends AbstractHyperl= inkPartitioner implements IHyperlinkPartitionRecognizer { + public static final String JSP_BEAN_GET_PROPERTY_PARTITION =3D "org.jboss= .tools.common.text.ext.jsp.JSP_BEAN_GET_PROPERTY"; //$NON-NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()= ); + if (n =3D=3D null || !(n instanceof Attr)) return null; + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if(start < 0) return null; + + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_BEAN_GET_PROPERTY_PARTITION; + int length =3D end - start - (superRegion.getOffset() - start); + int offset =3D superRegion.getOffset(); + = + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + = + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (!(n instanceof Attr)) return false; + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + = + if (start < 0 || start > region.getOffset() || end < region.getOffset()= ) = + return false; + + return true; + } finally { + smw.dispose(); + } + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlinkPartitio= ner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java 2009-09-25 15:01:55= UTC (rev 17747) @@ -0,0 +1,42 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.text.MessageFormat; + +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; + +/** + * @author Jeremy + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class JSPBeanSetPropertyHyperlink extends JSPBeanGetPropertyHyperli= nk { + + protected String getMethodPrefix() { + return SET_METHOD_PREFIX; + } + + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName =3D getPropertyName(fLastRegion); + if (propertyName =3D=3D null) + return MessageFormat.format(Messages.OpenA, Messages.Setter); + = + return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Mess= ages.Setter, propertyName); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlinkPartitioner.java 2009-09-= 25 15:01:55 UTC (rev 17747) @@ -0,0 +1,90 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * @author Jeremy + */ +public class JSPBeanSetPropertyHyperlinkPartitioner extends AbstractHyperl= inkPartitioner implements IHyperlinkPartitionRecognizer { + public static final String JSP_BEAN_SET_PROPERTY_PARTITION =3D "org.jboss= .tools.common.text.ext.jsp.JSP_BEAN_SET_PROPERTY"; //$NON-NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()= ); + if (n =3D=3D null || !(n instanceof Attr)) return null; + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_BEAN_SET_PROPERTY_PARTITION; + int length =3D end - start - (superRegion.getOffset() - start); + int offset =3D superRegion.getOffset(); + + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + = + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (!(n instanceof Attr)) return false; + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + = + if (start < 0 || start > region.getOffset() || end < region.getOffset()= ) = + return false; + + return true; + } finally { + smw.dispose(); + } + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlinkPartitio= ner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java 2009-09-25 15:0= 1:55 UTC (rev 17747) @@ -0,0 +1,118 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * * @deprecated see org.jboss.tools.common.text.ext.hyperlink.CSSClassHy= perlinkPartitioner + * @author Jeremy + */ +public class JSPCSSClassHyperlinkPartitioner extends AbstractHyperlinkPart= itioner /*implements IHyperlinkPartitionRecognizer */{ + public static final String JSP_CSS_CLASS_PARTITION =3D "org.jboss.tools.c= ommon.text.ext.jsp.JSP_CSS_CLASS"; //$NON-NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()); +// if (!recognize(document, superRegion)) return null; + IHyperlinkRegion r =3D getRegion(document, superRegion.getOffset()); + if (r =3D=3D null) return null; + = + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_CSS_CLASS_PARTITION; + int length =3D r.getLength() - (superRegion.getOffset() - r.getOffset()= ); + int offset =3D superRegion.getOffset(); + + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + = + public static IHyperlinkRegion getRegion(IDocument document, final int of= fset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + + if (n =3D=3D null || !(n instanceof Attr)) return null; + = + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + = + if (start < 0 || start > offset) return null; + + String attrText =3D document.get(start, end - start); + StringBuffer sb =3D new StringBuffer(attrText); + + //find start and end of path property + int bStart =3D 0; + int bEnd =3D attrText.length() - 1; + + while (bStart < bEnd && = + (sb.charAt(bStart) =3D=3D '\'' || sb.charAt(bStart) =3D=3D '\"' || + Character.isWhitespace(sb.charAt(bStart)))) { = + bStart++; + } + while (bEnd > bStart && = + (sb.charAt(bEnd) =3D=3D '\'' || sb.charAt(bEnd) =3D=3D '\"' || + Character.isWhitespace(sb.charAt(bEnd)))) { = + bEnd--; + } + bEnd++; + + int propStart =3D bStart + start; + int propLength =3D bEnd - bStart; + = + if (propStart > offset || propStart + propLength < offset) return null; + = + IHyperlinkRegion region =3D new HyperlinkRegion(propStart, propLength, = null, null, null); + return region; + } catch (BadLocationException x) { + //ignore + return null; + } finally { + smw.dispose(); + } + = + } + +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPClassHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPClassHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPClassHyperlinkPartitioner.java 2009-09-25 15:01:5= 5 UTC (rev 17747) @@ -0,0 +1,28 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLClassHyperlinkPart= itioner; + +/** + * @author Jeremy + */ +public class JSPClassHyperlinkPartitioner extends XMLClassHyperlinkPartiti= oner { + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPClassHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPElementAttributeValueHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementAttributeValueHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementAttributeValueHyperlinkPartitioner.java 20= 09-09-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,28 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLElementAttributeVa= lueHyperlinkPartitioner; + +/** + * @author Jeremy + */ +public class JSPElementAttributeValueHyperlinkPartitioner extends XMLEleme= ntAttributeValueHyperlinkPartitioner { + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPElementAttributeValueHyperlinkPa= rtitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPElementHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementHyperlinkPartitioner.java 2009-09-25 15:01= :55 UTC (rev 17747) @@ -0,0 +1,29 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLElementHyperlinkPa= rtitioner; + +/** + * @author Jeremy + */ +public class JSPElementHyperlinkPartitioner extends XMLElementHyperlinkPar= titioner { + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPElementHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementNameHyperlink.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementNameHyperlink.java 2009-09-25 15:01:55 UTC= (rev 17747) @@ -0,0 +1,141 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.text.MessageFormat; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IRegion; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.FindObjectHelper; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper; +import org.jboss.tools.jst.web.tld.ITaglibMapping; +import org.jboss.tools.jst.web.tld.IWebProject; +import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.w3c.dom.Document; + +/** + * @author Jeremy + */ +public class JSPElementNameHyperlink extends AbstractHyperlink { + + /** = + * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jfac= e.text.IRegion) + */ + protected void doHyperlink(IRegion region) { + XModelObject object =3D getFilename(region); + if(object !=3D null) { + FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONL= Y); + } else { + openFileFailed(); + } + } + = + protected final String JAR_FILE_PROTOCOL =3D "jar:file:/";//$NON-NLS-1$ + = + /* + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlink#openFileInEdito= r(java.lang.String) + */ + protected void openFileInEditor(String fileString) { + = + if (fileString.startsWith(JAR_FILE_PROTOCOL)) { + fileString =3D fileString.substring(JAR_FILE_PROTOCOL.length()); + = + IEditorInput jarEditorInput =3D createEditorInput(fileString); + IEditorPart part =3D openFileInEditor(jarEditorInput, fileString= ); + if (part =3D=3D null) openFileFailed(); + } else { + super.openFileInEditor(fileString); = + } + } + + private XModelObject getFilename(IRegion region) { + XModel xModel =3D getXModel(); + if (xModel =3D=3D null) return null; + + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + String nodePrefix =3D getTagPrefix(region); + if (nodePrefix =3D=3D null) = + return null; + + TaglibManagerWrapper tmw =3D new TaglibManagerWrapper(); + tmw.init(getDocument(), region.getOffset()); + if(!tmw.exists()) return null; + String uri =3D tmw.getUri(nodePrefix); + + if (uri =3D=3D null) return null; + = + IWebProject wp =3D WebProjectFactory.instance.getWebProject(xModel); + if (wp =3D=3D null) return null; + = + ITaglibMapping tm =3D wp.getTaglibMapping(); + if (tm =3D=3D null) return null; + tm.invalidate(); + return tm.getTaglibObject(uri); + } finally { + smw.dispose(); + } + } + = + private String getTagPrefix(IRegion region) { + if (region =3D=3D null) + return null; + = + String nodeName; + try { + nodeName =3D getDocument().get(region.getOffset(), region.getLength()); + } catch (BadLocationException e) { + // Ignore + return null; + } + if (nodeName.indexOf(":") !=3D -1) { //$NON-NLS-1$ + String nodePrefix =3D nodeName.substring(0, nodeName.indexOf(":")); //$= NON-NLS-1$ + if (nodePrefix !=3D null && nodePrefix.length() > 0) = + return nodePrefix; + } + return null; + } + = + IRegion fLastRegion =3D null; + /** = + * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) + */ + protected IRegion doGetHyperlinkRegion(int offset) { + fLastRegion =3D JSPElementNameHyperlinkPartitioner.getRegion(getDocument= (), offset); + return fLastRegion; + } + + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String tagPrefix =3D getTagPrefix(fLastRegion); + if (tagPrefix =3D=3D null) + return MessageFormat.format(Messages.OpenA, Messages.TagLibrary); + = + return MessageFormat.format(Messages.OpenTagLibraryForPrefix, tagPrefix); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPElementNameHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementNameHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPElementNameHyperlinkPartitioner.java 2009-09-25 1= 5:01:55 UTC (rev 17747) @@ -0,0 +1,66 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.util.Map; +import org.eclipse.jface.text.IDocument; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLElementNameHyperli= nkPartitioner; + +/** + * @author Jeremy + */ +public class JSPElementNameHyperlinkPartitioner extends XMLElementNameHype= rlinkPartitioner { + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + if (!super.recognize(document, region)) return false; + = + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + Element elem =3D (Element)n; + + IHyperlinkRegion r =3D getRegion(document, region.getOffset()); + if (r =3D=3D null) return false; + = + String nodeName =3D elem.getNodeName(); + if (nodeName.indexOf(":") =3D=3D -1) return false; //$NON-NLS-1$ + String nodePrefix =3D nodeName.substring(0, nodeName.indexOf(":")); //$= NON-NLS-1$ + if (nodePrefix =3D=3D null || nodePrefix.length() =3D=3D 0) return fals= e; + = + Map trackers =3D JSPRootHyperlinkPartitioner.getTrackersMap(document, r= egion.getOffset()); + return (trackers !=3D null && trackers.containsKey(nodePrefix)); + } finally { + smw.dispose(); + } + } + + = +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPElementNameHyperlinkPartitioner.= java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java (= rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2009-09-25 15:01:55 UTC (= rev 17747) @@ -0,0 +1,196 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.text.MessageFormat; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; + +/** + * @author Jeremy + */ +public class JSPForBeanIdHyperlink extends AbstractHyperlink { + private static final String USEBEAN_TAGNAME =3D "jsp:useBean"; //$NON-NLS= -1$ + private static final String ID_ATTRNAME =3D "id"; //$NON-NLS-1$ + + /** = + * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jfac= e.text.IRegion) + */ + protected void doHyperlink(IRegion region) { + String forID =3D getForId(region); + IRegion elementByID =3D findElementByIDBackward(forID, region.getOffset(= ), USEBEAN_TAGNAME); + if (elementByID !=3D null) { + StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(elementBy= ID); + } else { + openFileFailed(); + } + } + = + private IRegion findElementByIDBackward (String id, int endOffset, String= tagname) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, endOffset); + + if (n =3D=3D null) return null; + if (n instanceof Attr) n =3D ((Attr)n).getOwnerElement(); + if (n =3D=3D null) return null; + + Element element =3D null; + for (Node parent =3D n; parent !=3D null && element =3D=3D null; parent= =3D parent.getParentNode()) { + element =3D findElementByIDBackward(xmlDocument.getChildNodes(), id, e= ndOffset, tagname); = + } + + if (!(element instanceof IDOMElement)) return null; + = + final int offset =3D Utils.getValueStart(element); + final int length =3D ((IDOMElement)element).getStartStructuredDocumentR= egion().getLength(); + return new Region (offset, length); + } finally { + smw.dispose(); + } + } + = + private Element findElementByIDBackward(NodeList list, String id, int end= Offset, String tagName) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + + for (int i =3D list.getLength() - 1; list !=3D null && i >=3D 0; i--) { + if(!(list.item(i) instanceof Element)) continue; + Element element =3D (Element)list.item(i); + int start =3D Utils.getValueStart(element); + if (start < 0 || start >=3D endOffset) continue; + = + String elementName =3D element.getNodeName(); + if (tagName.equals(elementName)) { + = + Attr idAttr =3D (Attr)element.getAttributeNode(ID_ATTRNAME); + if (idAttr !=3D null) { + String val =3D Utils.trimQuotes(idAttr.getNodeValue()); + if (id.equals(val)) { + return element; + } + } + } + = + if (element.hasChildNodes()) { + Element child =3D findElementByIDBackward(element.getChildNodes(), i= d, endOffset, tagName); + if (child !=3D null) return child; + } + } + } finally { + smw.dispose(); + } + return null; + } + + + String getForId(IRegion region) { + try { + return Utils.trimQuotes(getDocument().get(region.getOffset(), region.ge= tLength())); + } catch (BadLocationException x) { + //ignore + return null; + } + } + + IRegion fLastRegion =3D null; + /* + * (non-Javadoc) + * = + * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) + */ + protected IRegion doGetHyperlinkRegion(int offset) { + fLastRegion =3D getRegion(offset); + return fLastRegion; + } + + private IRegion getRegion(int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + + if (n =3D=3D null || !(n instanceof Attr || n instanceof Text)) return = null; + = + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + + if (start > offset || end < offset) return null; + + String text =3D getDocument().get(start, end - start); + StringBuffer sb =3D new StringBuffer(text); + + //find start and end of path property + int bStart =3D 0; + int bEnd =3D text.length() - 1; + + while (bStart < bEnd && (Character.isWhitespace(sb.charAt(bStart)) = + || sb.charAt(bStart) =3D=3D '\"' || sb.charAt(bStart) =3D=3D '\"')) { = + bStart++; + } + while (bEnd > bStart && (Character.isWhitespace(sb.charAt(bEnd)) = + || sb.charAt(bEnd) =3D=3D '\"' || sb.charAt(bEnd) =3D=3D '\"')) { = + bEnd--; + } + bEnd++; + + final int propStart =3D bStart + start; + final int propLength =3D bEnd - bStart; + = + if (propStart > offset || propStart + propLength < offset) return null; + = + return new Region (propStart,propLength); + } catch (BadLocationException x) { + //ignore + return null; + } finally { + smw.dispose(); + } + } + + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String forId =3D getForId(fLastRegion); + if (forId =3D=3D null) + return MessageFormat.format(Messages.BrowseFor, Messages.BeanId); + = + return MessageFormat.format(Messages.BrowseForBeanId, forId); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPForBeanIdHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPForBeanIdHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPForBeanIdHyperlinkPartitioner.java 2009-09-25 15:= 01:55 UTC (rev 17747) @@ -0,0 +1,117 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * @author Jeremy + */ +public class JSPForBeanIdHyperlinkPartitioner extends AbstractHyperlinkPar= titioner /*implements IHyperlinkPartitionRecognizer */{ + public static final String JSP_FOR_BEAN_ID_PARTITION =3D "org.jboss.tools= .common.text.ext.jsp.JSP_FOR_BEAN_ID"; //$NON-NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()); +// if (!recognize(document, superRegion)) return null; + IHyperlinkRegion r =3D getRegion(document, superRegion.getOffset()); + if (r =3D=3D null) return null; + = + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_FOR_BEAN_ID_PARTITION; + int length =3D r.getLength() - (superRegion.getOffset() - r.getOffset()= ); + int offset =3D superRegion.getOffset(); + + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + = + public static IHyperlinkRegion getRegion(IDocument document, final int of= fset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + + if (n =3D=3D null || !(n instanceof Attr)) return null; + = + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + = + if (start < 0 || start > offset) return null; + + String attrText =3D document.get(start, end - start); + StringBuffer sb =3D new StringBuffer(attrText); + + //find start and end of path property + int bStart =3D 0; + int bEnd =3D attrText.length() - 1; + + while (bStart < bEnd && = + (sb.charAt(bStart) =3D=3D '\'' || sb.charAt(bStart) =3D=3D '\"' || + Character.isWhitespace(sb.charAt(bStart)))) { = + bStart++; + } + while (bEnd > bStart && = + (sb.charAt(bEnd) =3D=3D '\'' || sb.charAt(bEnd) =3D=3D '\"' || + Character.isWhitespace(sb.charAt(bEnd)))) { = + bEnd--; + } + bEnd++; + + int propStart =3D bStart + start; + int propLength =3D bEnd - bStart; + = + if (propStart > offset || propStart + propLength < offset) return null; + = + IHyperlinkRegion region =3D new HyperlinkRegion(propStart, propLength, = null, null, null); + return region; + } catch (BadLocationException x) { + //ignore + return null; + } finally { + smw.dispose(); + } + = + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPForBeanIdHyperlinkPartitioner.ja= va ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java 2009-09-25 15:01:55= UTC (rev 17747) @@ -0,0 +1,44 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLLinkHyperlinkParti= tioner; + +/** + * @author Jeremy + */ +public class JSPLinkHyperlinkPartitioner extends XMLLinkHyperlinkPartition= er { + public static final String JSP_LINK_PARTITION =3D "org.jboss.tools.common= .text.ext.jsp.JSP_LINK"; //$NON-NLS-1$ + + /* (non-Javadoc) + * @see org.jboss.tools.common.text.ext.hyperlink.XMLLinkHyperlinkPartiti= oner#getPartitionType() + */ + protected String getPartitionType() { + return JSP_LINK_PARTITION; + } + + /* (non-Javadoc) + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + return true; + } + + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPLinkHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPRelativeLinkHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPRelativeLinkHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPRelativeLinkHyperlinkPartitioner.java 2009-09-25 = 15:01:55 UTC (rev 17747) @@ -0,0 +1,44 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLLinkHyperlinkParti= tioner; + +/** + * @author Jeremy + */ +public class JSPRelativeLinkHyperlinkPartitioner extends XMLLinkHyperlinkP= artitioner { + public static final String JSP_RELATIVE_LINK_PARTITION =3D "org.jboss.too= ls.common.text.ext.jsp.JSP_RELATIVE_LINK"; //$NON-NLS-1$ + + /* (non-Javadoc) + * @see org.jboss.tools.common.text.ext.hyperlink.XMLLinkHyperlinkPartiti= oner#getPartitionType() + */ + protected String getPartitionType() { + return JSP_RELATIVE_LINK_PARTITION; + } + + /* (non-Javadoc) + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + return true; + } + + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPRelativeLinkHyperlinkPartitioner= .java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java 2009-09-25 15:01:55= UTC (rev 17747) @@ -0,0 +1,229 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentMan= ager; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.jboss.tools.jst.web.tld.ITaglibMapping; +import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * @author Jeremy + */ +public class JSPRootHyperlinkPartitioner extends AbstractHyperlinkPartitio= ner implements IHyperlinkPartitionRecognizer { + public static final String JSP_ROOT_PARTITION =3D "org.jboss.tools.common= .text.ext.jsp.JSP_ROOT"; //$NON-NLS-1$ + = + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + if (!recognize(document, superRegion)) return null; + = + String axis =3D computeAxis(document, superRegion.getOffset()) + "/"; //= $NON-NLS-1$ + String contentType =3D superRegion.getContentType(); + String type =3D JSP_ROOT_PARTITION; + int length =3D superRegion.getLength(); + int offset =3D superRegion.getOffset(); + = + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, co= ntentType, type); + return region; + } + + public static String computeAxis(IDocument document, int offset) { + String axis =3D ""; //$NON-NLS-1$ + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + Map trackersMap =3D getTrackersMap(document, offset); + = + IFile file =3D smw.getFile(); + XModel xModel =3D AbstractHyperlink.getXModel(file); + ITaglibMapping tm =3D xModel =3D=3D null ? null : WebProjectFactory.ins= tance.getWebProject(xModel).getTaglibMapping(); + + if (n !=3D null) { + if ((n instanceof Element || n instanceof Attr) && + n.getNodeName() !=3D null && n.getNodeName().length() > 0) { + = + String name =3D n.getNodeName(); + + // The node name extraction must be done by taking into account 'jsfc= ' attribute value + if (n instanceof Element) { + Element e =3D (Element)n; + String jsfcAttrValue =3D e.getAttribute("jsfc"); //$NON-NLS-1$ + if (jsfcAttrValue !=3D null && jsfcAttrValue.trim().length() > 0) { + name =3D jsfcAttrValue; + } + } + = + String nodeName =3D extractName(name, trackersMap, tm); + axis =3D "/" + nodeName; //$NON-NLS-1$ + } + Node parent =3D (n instanceof Attr)? ((Attr)n).getOwnerElement() : n.g= etParentNode(); + while (parent instanceof Element) { + // Get the axis part depending on the type and name of node + String name =3D parent.getNodeName(); + + // The node name extraction must be done by taking into account 'jsfc= ' attribute value + if (parent instanceof Element) { + Element e =3D (Element)parent; + String jsfcAttrValue =3D e.getAttribute("jsfc"); //$NON-NLS-1$ + if (jsfcAttrValue !=3D null && jsfcAttrValue.trim().length() > 0) { + name =3D jsfcAttrValue; + } + } + = + String nodeName =3D extractName(name, trackersMap, tm); + if (nodeName !=3D null && nodeName.length() > 0) = + axis =3D "/" + nodeName + axis; //$NON-NLS-1$ + parent =3D parent.getParentNode(); + } + } + } finally { + smw.dispose(); + } + = + if (axis =3D=3D null || axis.length() =3D=3D 0) axis =3D ""; //$NON-NLS-= 1$ + return axis; + } + = + public static String extractName (String name, Map trackersMap, ITaglibMa= pping tm) { + if (trackersMap =3D=3D null || trackersMap.size() =3D=3D 0) return name; + if (name =3D=3D null) return null; + int column =3D name.indexOf(":"); //$NON-NLS-1$ + if (column =3D=3D -1) return name; + String prefix =3D name.substring(0, column); + if (prefix =3D=3D null || prefix.trim().length() =3D=3D 0) return name; + = + String uri =3D (String)trackersMap.get(prefix); + if (uri =3D=3D null || uri.length() =3D=3D 0) return name; + = + String resolvedUri =3D (tm =3D=3D null ? uri : tm.resolveURI(uri)); + = + return "[" + resolvedUri + "]" + name.substring(column); //$NON-NLS-1$ = //$NON-NLS-2$ + } + + public static Map getTrackersMap(IDocument document, int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + TLDCMDocumentManager manager =3D TaglibController.getTLDCMDocumentManag= er(document); + = + List trackers =3D (manager =3D=3D null? null : manager.getCMDocumentTra= ckers(offset)); + = + Map map =3D new HashMap(); + // Find F tracker +// TaglibTracker fTT =3D null; + for (int i =3D 0; trackers !=3D null && i < trackers.size(); i++) { + TaglibTracker tt =3D (TaglibTracker)trackers.get(i); + String prefix =3D tt.getPrefix(); + String uri =3D tt.getURI(); + if (prefix !=3D null && prefix.trim().length() > 0 && + uri !=3D null && uri.trim().length() > 0) { + map.put(prefix.trim(), uri.trim()); + } + } + map =3D addAlternativeTrackersMap(map, document, offset); + + return map; + } finally { + smw.dispose(); + } + } + + // DONE: alternative trackers map (for use along with xhtml documents) + public static Map addAlternativeTrackersMap(Map map, IDocument document, int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + if (map =3D=3D null) map =3D new HashMap(); + + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + while (n !=3D null) { + if (!(n instanceof Element)) { + if (n instanceof Attr) { + n =3D ((Attr)n).getOwnerElement(); + } else { + n =3D n.getParentNode(); + } + continue; + } + = + NamedNodeMap attrs =3D n.getAttributes(); + for (int j =3D 0; attrs !=3D null && j < attrs.getLength(); j++) { + Attr a =3D (Attr)attrs.item(j); + String name =3D a.getName(); + if (name.startsWith("xmlns:")) { //$NON-NLS-1$ + String uri =3D a.getValue(); + String prefix =3D name.substring("xmlns:".length()); //$NON-NLS-1$ + map.put(prefix.trim(), uri.trim()); + } + } + = + n =3D n.getParentNode(); + } + + return map; + } finally { + smw.dispose(); + } + } + + /* (non-Javadoc) + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + + if (n =3D=3D null) return false; + = + return true; + } finally { + smw.dispose(); + } + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java 2009-0= 9-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,237 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.Text; + +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * @author Jeremy + */ +public class JSPStylesheetRelLinkHyperlinkPartitioner extends AbstractHype= rlinkPartitioner implements IHyperlinkPartitionRecognizer { + public static final String JSP_STYLESHEET_REL_LINK_PARTITION =3D "org.jbo= ss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK"; //$NON-NLS-1$ + = + private static final String LINK_TAGNAME =3D "link"; //$NON-NLS-1$ + private static final String REL_ATTRNAME =3D "rel"; //$NON-NLS-1$ + private static final String VALID_REL_ATTRVALUE =3D "stylesheet"; //$NON-= NLS-1$ + private static final String HREF_ATTRNAME =3D "href"; //$NON-NLS-1$ + + private static final String IMPORT_DIRECTIVENAME =3D "@import"; //$NON-NL= S-1$ + private static final String URL_METHODSTART =3D "url("; //$NON-NLS-1$ + private static final String URL_METHODEND =3D ")"; //$NON-NLS-1$ + private static final String URL_METHODEND_2 =3D ";"; //$NON-NLS-1$ + = + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + if(superRegion =3D=3D null) return null; + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()); +// if (!recognize(document, superRegion)) return null; + IRegion r =3D getRegion(document, superRegion.getOffset()); + if (r =3D=3D null) return null; + = + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_STYLESHEET_REL_LINK_PARTITION; + int length =3D r.getLength() - (superRegion.getOffset() - r.getOffset()= ); + int offset =3D superRegion.getOffset(); + + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + if(region =3D=3D null) return false; + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + + Attr attr =3D null; + Node tag =3D null; + Text styleText =3D null; + = + if (n instanceof Attr) { + attr =3D (Attr)n; + tag =3D ((Attr)n).getOwnerElement(); + } else if (n instanceof Element) { + tag =3D n; + } else if (n instanceof Text) { + styleText =3D (Text)n; + } else = + return false; + = + + if (attr !=3D null || tag !=3D null) { + // do recognize link tag + if (!LINK_TAGNAME.equalsIgnoreCase(tag.getNodeName())) = + return false; + = + String linkRel =3D Utils.getAttributeValue(document, tag, REL_ATTRNAME= ); + if (!VALID_REL_ATTRVALUE.equalsIgnoreCase(linkRel)) + return false; + = + return true; + } + = + if (styleText =3D=3D null) return false; + + // do recognize style text + int start =3D Utils.getValueStart(styleText); + int current =3D region.getOffset(); + = + String text =3D styleText.getData(); + if (text =3D=3D null || text.length() =3D=3D 0) return false; + + text =3D text.toLowerCase(); + = + int importStart =3D text.lastIndexOf(IMPORT_DIRECTIVENAME.toLowerCase()= , current - start); + if (importStart =3D=3D -1) + return false; + = + int urlMethodStart =3D text.indexOf(URL_METHODSTART.toLowerCase(), impo= rtStart); + if (urlMethodStart =3D=3D -1) + return false; + = + int urlMethodEnd =3D text.indexOf(URL_METHODEND.toLowerCase(), urlMetho= dStart); + if (urlMethodEnd =3D=3D -1) + return false; + + int urlMethodEnd2 =3D text.indexOf(URL_METHODEND_2.toLowerCase(), urlMe= thodEnd); + if (urlMethodEnd2 =3D=3D -1) + return false; + + if (current < start + urlMethodStart + URL_METHODSTART.length() || + current >=3D start + urlMethodEnd) + return false; + = + return true; + } finally { + smw.dispose(); + } + } + + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + + protected IRegion getRegion (IDocument document, int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + = + if (n =3D=3D null || !(n instanceof Text || n instanceof Attr)) return = null; + = + String text =3D null; + int bStart =3D 0; + int bEnd =3D 0; + = + if (n instanceof Text) { + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + + if (start < 0 || start > offset) return null; + = + text =3D document.get(start, end - start); + bStart =3D offset - start; + bEnd =3D offset - start; + } else if (n instanceof Attr) { + Attr attr =3D (Attr)n; + if (!HREF_ATTRNAME.equalsIgnoreCase(attr.getName())) return null; + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if(start < 0) return null; + = + text =3D document.get(start, end - start); + bStart =3D offset - start; + bEnd =3D offset - start; + } + StringBuffer sb =3D new StringBuffer(text); + //find start of bean property + while (bStart >=3D 0) { = + if (!Character.isJavaIdentifierPart(sb.charAt(bStart)) && + sb.charAt(bStart) !=3D '\\' && sb.charAt(bStart) !=3D '/' && + sb.charAt(bStart) !=3D ':' && sb.charAt(bStart) !=3D '-' && + sb.charAt(bStart) !=3D '.' && sb.charAt(bStart) !=3D '_' && + sb.charAt(bStart) !=3D '%' && sb.charAt(bStart) !=3D '?' && + sb.charAt(bStart) !=3D '&' && sb.charAt(bStart) !=3D '=3D') { + bStart++; + break; + } + = + if (bStart =3D=3D 0) break; + bStart--; + } + // find end of bean property + while (bEnd >=3D 0 && bEnd < sb.length()) { = + if (!Character.isJavaIdentifierPart(sb.charAt(bEnd)) && + sb.charAt(bEnd) !=3D '\\' && sb.charAt(bEnd) !=3D '/' && + sb.charAt(bEnd) !=3D ':' && sb.charAt(bEnd) !=3D '-' && + sb.charAt(bEnd) !=3D '.' && sb.charAt(bEnd) !=3D '_' && + sb.charAt(bEnd) !=3D '%' && sb.charAt(bEnd) !=3D '?' && + sb.charAt(bEnd) !=3D '&' && sb.charAt(bEnd) !=3D '=3D') { + break; + } + bEnd++; + } + = + final int propStart =3D bStart + Utils.getValueStart(n); + final int propLength =3D bEnd - bStart; + = + if (propStart > offset || propStart + propLength < offset) return null; + return new Region(propStart,propLength); + } catch (BadLocationException x) { + //ignore + return null; + } finally { + smw.dispose(); + } + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartit= ioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPTagAttributeHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTagAttributeHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTagAttributeHyperlinkPartitioner.java 2009-09-25 = 15:01:55 UTC (rev 17747) @@ -0,0 +1,94 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * @author Jeremy + */ +public class JSPTagAttributeHyperlinkPartitioner extends JSPElementAttribu= teValueHyperlinkPartitioner implements IHyperlinkPartitionRecognizer { + public static final String JSP_TAG_ATTRIBUTE_PARTITION =3D "org.jboss.too= ls.common.text.ext.jsp.JSP_TAG_ATTRIBUTE"; //$NON-NLS-1$ + = + private static final String JSP_ATTRIBUTE_TAGNAME =3D "jsp:attribute"; //= $NON-NLS-1$ + private static final String JSP_ELEMENT_TAGNAME =3D "jsp:element"; //$NON= -NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()= ); + if (n instanceof Attr) n =3D ((Attr)n).getOwnerElement(); + if (!(n instanceof Element)) return null; + + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if(start < 0) return null; + + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_TAG_ATTRIBUTE_PARTITION; + int length =3D end - start - (superRegion.getOffset() - start); + int offset =3D superRegion.getOffset(); + + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + if(region =3D=3D null) return false; + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (n instanceof Attr) n =3D ((Attr)n).getOwnerElement(); + if (!(n instanceof Element)) return false; + return (JSP_ATTRIBUTE_TAGNAME.equals(n.getNodeName()) && = + !JSP_ELEMENT_TAGNAME.equals(n.getParentNode().getNodeName()) && = + n.getNodeName().indexOf(':') !=3D -1); + } finally { + smw.dispose(); + } + } + + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPTagAttributeHyperlinkPartitioner= .java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPTagAttributeValueHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTagAttributeValueHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTagAttributeValueHyperlinkPartitioner.java 2009-0= 9-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,30 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLTagAttributeValueH= yperlinkPartitioner; + +/** + * @author Jeremy + */ +public abstract class JSPTagAttributeValueHyperlinkPartitioner extends XML= TagAttributeValueHyperlinkPartitioner implements IHyperlinkPartitionRecogni= zer { + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPTagAttributeValueHyperlinkPartit= ioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTaglibHyperlink.java (rev= 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2009-09-25 15:01:55 UTC (rev= 17747) @@ -0,0 +1,160 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.text.MessageFormat; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.FindObjectHelper; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.jboss.tools.jst.web.tld.ITaglibMapping; +import org.jboss.tools.jst.web.tld.IWebProject; +import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +/** + * @author Jeremy + */ +public class JSPTaglibHyperlink extends AbstractHyperlink { + = + /** = + * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jfac= e.text.IRegion) + */ + protected void doHyperlink(IRegion region) { + XModelObject object =3D getFilename(region); + if(object !=3D null) = + FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONL= Y); + else { + openFileFailed(); + } + + } + = + protected final String JAR_FILE_PROTOCOL =3D "jar:file:/";//$NON-NLS-1$ + = + /* (non-Javadoc) + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlink#openFileInEdito= r(java.lang.String) + */ + protected void openFileInEditor(String fileString) { + if (fileString.startsWith(JAR_FILE_PROTOCOL)) { + fileString =3D fileString.substring(JAR_FILE_PROTOCOL.length()); + IEditorInput jarEditorInput =3D createEditorInput(fileString); + IEditorPart part =3D openFileInEditor(jarEditorInput, fileString); + if (part =3D=3D null) openFileFailed(); + } else { + super.openFileInEditor(fileString); = + } + } + = + private XModelObject getFilename(IRegion region) { + IFile file =3D getFile(); + XModel xModel =3D getXModel(file); + if (xModel =3D=3D null) return null; + + String uri =3D getTaglibUri(region); + if (uri =3D=3D null) return null; + = + IWebProject wp =3D WebProjectFactory.instance.getWebProject(xModel); + if (wp =3D=3D null) return null; + = + ITaglibMapping tm =3D wp.getTaglibMapping(); + if (tm =3D=3D null) return null; + = + return tm.getTaglibObject(uri); + } + = + private String getTaglibUri(IRegion region) { + IStructuredModel model =3D null; + try { = + model =3D getModelManager().getExistingModelForRead(getDocument()); + IDOMDocument xmlDocument =3D (model instanceof IDOMModel) ? ((IDOMModel= ) model).getDocument() : null; + if (xmlDocument =3D=3D null) return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (n instanceof IDOMAttr) n =3D ((IDOMAttr)n).getOwnerElement(); + if (!(n instanceof IDOMElement)) return null; + if(!"jsp:directive.taglib".equals(n.getNodeName())) return null; //$NON= -NLS-1$ + + IDOMElement taglib =3D (IDOMElement)n; + = + String uri =3D taglib.getAttribute("uri"); //$NON-NLS-1$ + if (uri =3D=3D null || uri.trim().length() =3D=3D 0) return null; + = + return uri; + } finally { + if (model !=3D null) model.releaseFromRead(); + } + } + + IRegion fLastRegion =3D null; + /* + * (non-Javadoc) + * = + * @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) + */ + protected IRegion doGetHyperlinkRegion(int offset) { + fLastRegion =3D getRegion(offset); + return fLastRegion; + } + = + private IRegion getRegion(int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(getDocument()); + try { = + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + if (n instanceof Attr) n =3D ((Attr)n).getOwnerElement(); + if (!(n instanceof IDOMElement)) return null; + if (!"jsp:directive.taglib".equals(n.getNodeName())) return null; //$NO= N-NLS-1$ + + IDOMElement taglib =3D (IDOMElement)n; + = + final int taglibLength =3D taglib.getEndOffset() - taglib.getStartOffse= t(); + final int taglibOffset =3D taglib.getStartOffset(); + = + return new Region(taglibOffset,taglibLength); + } finally { + smw.dispose(); + } + } + = + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri =3D getTaglibUri(fLastRegion); + if (uri =3D=3D null) + return MessageFormat.format(Messages.OpenA, Messages.TagLibrary); + = + return MessageFormat.format(Messages.OpenTagLibraryForUri, uri); + } + +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPTaglibHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTaglibHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTaglibHyperlinkPartitioner.java 2009-09-25 15:01:= 55 UTC (rev 17747) @@ -0,0 +1,91 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; + +/** + * @author Jeremy + */ +public class JSPTaglibHyperlinkPartitioner extends JSPElementAttributeValu= eHyperlinkPartitioner implements IHyperlinkPartitionRecognizer { + public static final String JSP_TAGLIB_PARTITION =3D "org.jboss.tools.comm= on.text.ext.jsp.JSP_TAGLIB"; //$NON-NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + if(document =3D=3D null || superRegion =3D=3D null) return null; + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()= ); + if (n instanceof Attr) n =3D ((Attr)n).getOwnerElement(); + if (!(n instanceof Element)) return null; + if (!"jsp:directive.taglib".equals(n.getNodeName())) return null; //$NO= N-NLS-1$ + + int start =3D Utils.getValueStart(n); + int end =3D Utils.getValueEnd(n); + if(start < 0) return null; + = + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_TAGLIB_PARTITION; + int length =3D end - start - (superRegion.getOffset() - start); + int offset =3D superRegion.getOffset(); + = + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + = + + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + if(document =3D=3D null || region =3D=3D null) return false; + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (n instanceof Attr) n =3D ((Attr)n).getOwnerElement(); + if (!(n instanceof Element)) return false; + return ("jsp:directive.taglib".equals(n.getNodeName())); //$NON-NLS-1$ + } finally { + smw.dispose(); + } + } + + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPTaglibHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPTextHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTextHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPTextHyperlinkPartitioner.java 2009-09-25 15:01:55= UTC (rev 17747) @@ -0,0 +1,29 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; + +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLTextHyperlinkParti= tioner; + +/** + * @author Jeremy + */ +public class JSPTextHyperlinkPartitioner extends XMLTextHyperlinkPartition= er { + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPTextHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java (rev = 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2009-09-25 15:01:55 UTC (rev = 17747) @@ -0,0 +1,174 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import java.text.MessageFormat; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.FindObjectHelper; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.jboss.tools.jst.web.tld.ITaglibMapping; +import org.jboss.tools.jst.web.tld.IWebProject; +import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author Jeremy + */ +public class JSPXmlNsHyperlink extends AbstractHyperlink { + = + /** = + * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jfac= e.text.IRegion) + */ + protected void doHyperlink(IRegion region) { + XModelObject object =3D getFilename(region); + if(object !=3D null) FindObjectHelper.findModelObject(object, FindObject= Helper.IN_EDITOR_ONLY); + else { + openFileFailed(); + } + } + = + protected final String JAR_FILE_PROTOCOL =3D "jar:file:/";//$NON-NLS-1$ + = + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlink#openFileInEdito= r(java.lang.String) + */ + protected void openFileInEditor(String fileString) { + if (fileString.startsWith(JAR_FILE_PROTOCOL)) { + fileString =3D fileString.substring(JAR_FILE_PROTOCOL.length()); + IEditorInput jarEditorInput =3D createEditorInput(fileString); + IEditorPart part =3D openFileInEditor(jarEditorInput, fileStrin= g); + if (part =3D=3D null) openFileFailed(); + } else { + super.openFileInEditor(fileString); = + } + } + = + private XModelObject getFilename(IRegion region) { + IFile file =3D getFile(); + XModel xModel =3D getXModel(file); + if (xModel =3D=3D null) return null; + + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (!(n instanceof IDOMAttr)) return null; = + Attr xmlnsAttr =3D (Attr)n; + if (xmlnsAttr.getName() =3D=3D null || !xmlnsAttr.getName().startsWith(= "xmlns:")) return null; //$NON-NLS-1$ + Element rootElem =3D (Element)xmlnsAttr.getOwnerElement(); + if (!(rootElem.getNodeName().equals("jsp:root") || rootElem.getNodeName= ().equalsIgnoreCase("html"))) return null; //$NON-NLS-1$ //$NON-NLS-2$ + + String uri =3D xmlnsAttr.getValue(); + if (uri =3D=3D null || uri.trim().length() =3D=3D 0) return null; + = + IWebProject wp =3D WebProjectFactory.instance.getWebProject(xModel); + if (wp =3D=3D null) return null; + = + ITaglibMapping tm =3D wp.getTaglibMapping(); + if (tm =3D=3D null) return null; + return tm.getTaglibObject(uri); + } finally { + smw.dispose(); + } + } + + private String getUri(IRegion region) { + IFile file =3D getFile(); + XModel xModel =3D getXModel(file); + if (xModel =3D=3D null) return null; + + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (!(n instanceof IDOMAttr)) return null; = + Attr xmlnsAttr =3D (Attr)n; + if (xmlnsAttr.getName() =3D=3D null || !xmlnsAttr.getName().startsWith(= "xmlns:")) return null; //$NON-NLS-1$ + Element rootElem =3D (Element)xmlnsAttr.getOwnerElement(); + if (!(rootElem.getNodeName().equals("jsp:root") || rootElem.getNodeName= ().equalsIgnoreCase("html"))) return null; //$NON-NLS-1$ //$NON-NLS-2$ + + String uri =3D xmlnsAttr.getValue(); + if (uri =3D=3D null || uri.trim().length() =3D=3D 0) return null; + = + return uri; + } finally { + smw.dispose(); + } + } + + + IRegion fLastRegion =3D null; + /** = + * @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) + */ + protected IRegion doGetHyperlinkRegion(int offset) { + fLastRegion =3D getRegion(offset); + return fLastRegion; + } + = + private IRegion getRegion(int offset) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + = + Node n =3D Utils.findNodeForOffset(xmlDocument, offset); + if (!(n instanceof IDOMAttr)) return null; = + IDOMAttr xmlnsAttr =3D (IDOMAttr)n; + if (xmlnsAttr.getName() =3D=3D null || !xmlnsAttr.getName().startsWith(= "xmlns:")) return null; //$NON-NLS-1$ + Element rootElem =3D xmlnsAttr.getOwnerElement(); + if (!(rootElem.getNodeName().equals("jsp:root") || rootElem.getNodeName= ().equalsIgnoreCase("html"))) return null; //$NON-NLS-1$ //$NON-NLS-2$ + + final int taglibLength =3D xmlnsAttr.getValueRegionText().length(); + final int taglibOffset =3D xmlnsAttr.getValueRegionStartOffset(); + + return new Region(taglibOffset,taglibLength); + } finally { + smw.dispose(); + } + + } + + /* + * (non-Javadoc) + * = + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri =3D getUri(fLastRegion); + if (uri =3D=3D null) + return MessageFormat.format(Messages.NotFound, "URI"); //$NON-NLS-1$ + = + return MessageFormat.format(Messages.Open, uri); + } +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/hyperlink/jsp/JSPXmlNsHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPXmlNsHyperlinkPartitioner.java = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPXmlNsHyperlinkPartitioner.java 2009-09-25 15:01:5= 5 UTC (rev 17747) @@ -0,0 +1,92 @@ +/*************************************************************************= ****** + * 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.text.ext.hyperlink.jsp; + +import org.eclipse.jface.text.IDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author Jeremy + */ +public class JSPXmlNsHyperlinkPartitioner extends AbstractHyperlinkPartiti= oner implements IHyperlinkPartitionRecognizer { + public static final String JSP_XMLNS_PARTITION =3D "org.jboss.tools.commo= n.text.ext.jsp.JSP_XMLNS"; //$NON-NLS-1$ + + /** + * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IH= yperlinkRegion) + */ + protected IHyperlinkRegion parse(IDocument document, IHyperlinkRegion sup= erRegion) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return null; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, superRegion.getOffset()= ); + if (!(n instanceof IDOMAttr)) return null; = + IDOMAttr xmlnsAttr =3D (IDOMAttr)n; + if (xmlnsAttr.getName() =3D=3D null || !xmlnsAttr.getName().startsWith(= "xmlns:")) return null; //$NON-NLS-1$ + Element rootElem =3D xmlnsAttr.getOwnerElement(); + if (!(rootElem.getNodeName().equals("jsp:root") || rootElem.getNodeName= ().equalsIgnoreCase("html"))) return null; //$NON-NLS-1$ //$NON-NLS-2$ + String xmlns =3D xmlnsAttr.getValueRegionText(); + String axis =3D getAxis(document, superRegion); + String contentType =3D superRegion.getContentType(); + String type =3D JSP_XMLNS_PARTITION; + int length =3D xmlns.length() - (superRegion.getOffset() - xmlnsAttr.ge= tValueRegionStartOffset()); + int offset =3D superRegion.getOffset(); + + IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, c= ontentType, type); + return region; + } finally { + smw.dispose(); + } + } + = + + /** + * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) + */ + public boolean recognize(IDocument document, IHyperlinkRegion region) { + StructuredModelWrapper smw =3D new StructuredModelWrapper(); + try { + smw.init(document); + Document xmlDocument =3D smw.getDocument(); + if (xmlDocument =3D=3D null) return false; + = + Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (!(n instanceof Attr)) return false; = + Attr xmlnsAttr =3D (Attr)n; + if (xmlnsAttr.getName() =3D=3D null || !xmlnsAttr.getName().startsWith(= "xmlns:")) return false; //$NON-NLS-1$ + Element rootElem =3D xmlnsAttr.getOwnerElement(); + if (!(rootElem.getNodeName().equals("jsp:root") || rootElem.getNodeName= ().equalsIgnoreCase("html"))) return false; //$NON-NLS-1$ //$NON-NLS-2$ + return true; + } finally { + smw.dispose(); + } + } + + = + protected String getAxis(IDocument document, IHyperlinkRegion superRegion= ) { + if (superRegion.getAxis() =3D=3D null || superRegion.getAxis().length() = =3D=3D 0) { + return JSPRootHyperlinkPartitioner.computeAxis(document, superRegion.ge= tOffset()) + "/"; //$NON-NLS-1$ + } + return superRegion.getAxis(); + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/hyperlink/jsp/JSPXmlNsHyperlinkPartitioner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/util/CSSTextScanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/util/CSSTextScanner.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/util/CSSTextScanner.java 2009-09-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,213 @@ +/*************************************************************************= ****** + * 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.text.ext.util; + +import java.io.InputStream; +import java.io.Reader; + +import org.eclipse.jface.text.rules.ICharacterScanner; +import org.eclipse.jface.text.rules.IToken; +import org.jboss.tools.common.text.ext.util.TextScanner; + +/** + * @author Jeremy + * + */ +public class CSSTextScanner extends TextScanner { + public static final String CSS_CLASS_NAME =3D "___css_class_name"; //$NON= -NLS-1$ + public static final String CSS_CLASS_NAME_SEPARATOR =3D "___css_class_nam= e_separator"; //$NON-NLS-1$ + public static final String CSS_CLASS_BODY =3D "___css_class_body"; //$NON= -NLS-1$ + public static final String CSS_CLASS_COMMENT =3D "___css_class_comment"; = //$NON-NLS-1$ + = + private static final int STATE_START =3D 0; + private static final int STATE_NAME =3D 1; + private static final int STATE_NAME_SEPARATOR =3D 2; + private static final int STATE_BODY =3D 3; + private static final int STATE_COMMENT =3D 4; + private static final int STATE_END =3D 5; + + private int state; + private int savedForCommentState; + = + /** + * @param stream + */ + public CSSTextScanner(InputStream stream) { + super(stream); + this.state =3D STATE_START; + } + /** + * @param reader + */ + public CSSTextScanner(Reader reader) { + super(reader); + this.state =3D STATE_START; + } + + private void setState(int newState) { + if (this.state !=3D STATE_COMMENT) + this.savedForCommentState =3D this.state; + this.state =3D newState; + } + = + /* (non-Javadoc) + * @see org.jboss.tools.jsf.text.ext.util.TextScanner#nextToken() + */ + public IToken nextToken() { + offset +=3D length; + switch (state) { + case STATE_START: + case STATE_NAME_SEPARATOR: + return nextNameSeparatorToken(); + case STATE_NAME: + return nextNameToken(); + case STATE_BODY: + return nextBodyToken(); + case STATE_COMMENT: + return nextCommentToken(); + } + return nextEndToken(); + } + = + private IToken nextNameToken() { + // Check first one char in the stream + int ch =3D read(); + if (ch =3D=3D ICharacterScanner.EOF) { + return getToken(CSS_CLASS_NAME); + } + if (!NMTOKEN_DETECTOR.isWordStart((char)ch)) { + // Emulate END of text + clearText(); + return getToken(CSS_CLASS_NAME); + } + + ch =3D read(); + int readsCount =3D 0; + while (ch !=3D ICharacterScanner.EOF) { + if (!NMTOKEN_DETECTOR.isWordPart((char)ch)) { + unread(); + state =3D STATE_NAME_SEPARATOR; + return getToken(CSS_CLASS_NAME); + } + readsCount++; + ch =3D read(); + } + return getToken(CSS_CLASS_NAME); + } + + private IToken nextNameSeparatorToken() { + int count =3D skipWhitespaceToken(); + if (count > 0) { + state =3D STATE_NAME_SEPARATOR; + return getToken(null); + } + int ch =3D read(); + int readsCount =3D 0; + while (ch !=3D ICharacterScanner.EOF) { + if (NMTOKEN_DETECTOR.isWordStart((char)ch)) { + unread(); + state =3D STATE_NAME; + return (readsCount > 0 ? getToken(CSS_CLASS_NAME_SEPARATOR) : nextName= Token()); + } + if (ch =3D=3D '{') { + unread(); + state =3D STATE_BODY; + return (readsCount > 0 ? getToken(CSS_CLASS_NAME_SEPARATOR) : nextBody= Token()); + } + if (ch =3D=3D '/') { + ch =3D read(); + if (ch =3D=3D ICharacterScanner.EOF) { + break; = + } + if (ch =3D=3D '*') { + // Comment openning + unread(); // Unread '*'-char + unread(); // Unread '/'-char + setState(STATE_COMMENT); + if (readsCount > 0) { + return getToken(CSS_CLASS_NAME_SEPARATOR); = + } else { + return nextCommentToken(); + } + } + // Broken file ??? Emulate END of text + clearText(); + return getToken(CSS_CLASS_NAME_SEPARATOR); + } + readsCount++; + ch =3D read(); + } + state =3D STATE_END; + return getToken(CSS_CLASS_NAME_SEPARATOR); + } + + private IToken nextBodyToken() { + int level =3D 0; + int ch =3D read(); + while (ch !=3D ICharacterScanner.EOF) { + if (ch =3D=3D '{') { + level++; + } else if (ch =3D=3D '}') { + level--; + if (level <=3D 0) { + state =3D STATE_START; + return getToken(CSS_CLASS_BODY); + } + } + if (ch =3D=3D '/') { + ch =3D read(); + if (ch =3D=3D ICharacterScanner.EOF) { + break; = + } + if (ch =3D=3D '*') { + // Comment openning + unread(); // Unread '*'-char + unread(); // Unread '/'-char + setState(STATE_COMMENT); + return getToken(CSS_CLASS_BODY); + } + // Broken file ??? Emulate END of text + clearText(); + return getToken(CSS_CLASS_BODY); + } + ch =3D read(); + } + state =3D STATE_END; + return getToken(CSS_CLASS_BODY); + } + = + private IToken nextCommentToken() { + int ch =3D read(); + while (ch !=3D ICharacterScanner.EOF) { + if (ch =3D=3D '*') { + ch =3D read(); + if (ch =3D=3D ICharacterScanner.EOF) break; = + if (ch =3D=3D '/') { + // Comment closing + setState(savedForCommentState); + return getToken(CSS_CLASS_COMMENT); + } + unread(); // Unread last char = + } + ch =3D read(); + } + setState(savedForCommentState); + return getToken(CSS_CLASS_COMMENT); + } + = + private IToken nextEndToken () { + state =3D STATE_END; + // Emulate END of text + clearText(); + return getToken(null); + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/util/CSSTextScanner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/j= st/text/ext/util/TaglibManagerWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/util/TaglibManagerWrapper.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/util/TaglibManagerWrapper.java 2009-09-25 15:01:55 UTC (rev 17747) @@ -0,0 +1,61 @@ +/*************************************************************************= ****** + * 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.text.ext.util; + +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.TLDCMDocumentMan= ager; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker; + +public class TaglibManagerWrapper { + TLDCMDocumentManager manager; + List trackers; + + public TaglibManagerWrapper() {} + = + public void init(IDocument document, int offset) { + manager =3D TaglibController.getTLDCMDocumentManager(document); + if(exists()) { + trackers =3D manager.getCMDocumentTrackers(offset); + } + } + = + public boolean exists() { + return manager !=3D null; + } + = + public String getUri(String prefix) { + for (int i =3D 0; i < trackers.size(); i++) { + TaglibTracker tt =3D (TaglibTracker)trackers.get(i); + if (prefix.equals(tt.getPrefix())) { + return tt.getURI(); + } + } + return null; + } + + public String getPrefix(String uri) { + for (int i =3D 0; i < trackers.size(); i++) { + TaglibTracker tt =3D (TaglibTracker)trackers.get(i); + if (uri.equals(tt.getURI())) { + return tt.getPrefix(); + } + } + return null; + } + + public String getCorePrefix() { + return getPrefix("http://java.sun.com/jsf/core"); //$NON-NLS-1$ + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org= /jboss/tools/jst/text/ext/util/TaglibManagerWrapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7795737015283084047==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:07:07 2009 Content-Type: multipart/mixed; boundary="===============4260483568376820337==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17748 - trunk/jsf/features/org.jboss.tools.richfaces.feature. Date: Fri, 25 Sep 2009 11:07:07 -0400 Message-ID: <200909251507.n8PF77dI001499@svn01.web.mwc.hst.phx2.redhat.com> --===============4260483568376820337== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:07:07 -0400 (Fri, 25 Sep 2009) New Revision: 17748 Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-0= 9-25 15:01:55 UTC (rev 17747) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-0= 9-25 15:07:07 UTC (rev 17748) @@ -167,6 +167,13 @@ unpack=3D"false"/> = + + --===============7671697603730219958== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:12:15 -0400 (Fri, 25 Sep 2009) New Revision: 17749 Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/sea= m/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/sea= m/text/ext/hyperlink/SeamViewHyperlinkPartitioner.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFES= T.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2= 009-09-25 15:07:07 UTC (rev 17748) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2= 009-09-25 15:12:15 UTC (rev 17749) @@ -22,6 +22,7 @@ org.jboss.tools.common.model, org.jboss.tools.common.el.core, org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, org.jboss.tools.jst.web, org.jboss.tools.jsf, org.jboss.tools.seam.core, Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/to= ols/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/se= am/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-09-25 15:07:07= UTC (rev 17748) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/se= am/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-09-25 15:12:15= UTC (rev 17749) @@ -35,7 +35,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperLinkPartitionPriori= ty; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.seam.core.ISeamContextVariable; Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/to= ols/seam/text/ext/hyperlink/SeamViewHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/se= am/text/ext/hyperlink/SeamViewHyperlinkPartitioner.java 2009-09-25 15:07:07= UTC (rev 17748) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/se= am/text/ext/hyperlink/SeamViewHyperlinkPartitioner.java 2009-09-25 15:12:15= UTC (rev 17749) @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPLinkHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.seam.internal.core.SeamProject; import org.jboss.tools.seam.text.ext.SeamExtPlugin; --===============7671697603730219958==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:15:50 2009 Content-Type: multipart/mixed; boundary="===============4059986602069337021==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17750 - trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF. Date: Fri, 25 Sep 2009 11:15:50 -0400 Message-ID: <200909251515.n8PFFoCD003669@svn01.web.mwc.hst.phx2.redhat.com> --===============4059986602069337021== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:15:50 -0400 (Fri, 25 Sep 2009) New Revision: 17750 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2009= -09-25 15:12:15 UTC (rev 17749) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2009= -09-25 15:15:50 UTC (rev 17750) @@ -25,6 +25,7 @@ org.eclipse.wst.sse.core, org.eclipse.wst.sse.ui, org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, org.jboss.tools.seam.text.ext, org.eclipse.jface.text, org.eclipse.wst.web.ui, --===============4059986602069337021==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:18:59 2009 Content-Type: multipart/mixed; boundary="===============4052907666953013371==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17751 - in trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets: src/org/jboss/tools/jsf/text/ext/facelets/hyperlink and 1 other directory. Date: Fri, 25 Sep 2009 11:18:59 -0400 Message-ID: <200909251518.n8PFIxWI004024@svn01.web.mwc.hst.phx2.redhat.com> --===============4052907666953013371== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:18:59 -0400 (Fri, 25 Sep 2009) New Revision: 17751 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFES= T.MF trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/to= ols/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithExprHyperlink= Partitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/to= ols/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithNoExprHyperli= nkPartitioner.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/= MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFE= ST.MF 2009-09-25 15:15:50 UTC (rev 17750) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFE= ST.MF 2009-09-25 15:18:59 UTC (rev 17751) @@ -10,6 +10,7 @@ org.eclipse.ui,org.eclipse.core.runtime, org.eclipse.core.resources,org.eclipse.jface.text, org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, org.jboss.tools.jsf.text.ext Export-Package: org.jboss.tools.jsf.text.ext.facelets, org.jboss.tools.jsf.text.ext.facelets.hyperlink Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/j= boss/tools/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithExprHy= perlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/t= ools/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithExprHyperlin= kPartitioner.java 2009-09-25 15:15:50 UTC (rev 17750) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/t= ools/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithExprHyperlin= kPartitioner.java 2009-09-25 15:18:59 UTC (rev 17751) @@ -14,7 +14,7 @@ = import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPElementAttributeVa= lueHyperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPElementAttributeValue= HyperlinkPartitioner; = public class FaceletsAttributeValueWithExprHyperlinkPartitioner extends JS= PElementAttributeValueHyperlinkPartitioner { public static final String FACELETS_ATTRIBUTE_VALUE_WITH_EXPR_PARTITION = =3D "org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR= "; //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/j= boss/tools/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithNoExpr= HyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/t= ools/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithNoExprHyperl= inkPartitioner.java 2009-09-25 15:15:50 UTC (rev 17750) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/src/org/jboss/t= ools/jsf/text/ext/facelets/hyperlink/FaceletsAttributeValueWithNoExprHyperl= inkPartitioner.java 2009-09-25 15:18:59 UTC (rev 17751) @@ -15,7 +15,7 @@ = import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPElementAttributeVa= lueHyperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPElementAttributeValue= HyperlinkPartitioner; = public class FaceletsAttributeValueWithNoExprHyperlinkPartitioner extends = JSPElementAttributeValueHyperlinkPartitioner { public static final String FACELETS_ATTRIBUTE_VALUE_WITH_NO_EXPR_PARTITIO= N =3D "org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_NO= _EXPR"; //$NON-NLS-1$ --===============4052907666953013371==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:25:56 2009 Content-Type: multipart/mixed; boundary="===============2417797043685655634==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17752 - in trunk/jsf/plugins/org.jboss.tools.jsf.text.ext: src/org/jboss/tools/jsf/text/ext/hyperlink and 1 other directory. Date: Fri, 25 Sep 2009 11:25:55 -0400 Message-ID: <200909251525.n8PFPtT6005544@svn01.web.mwc.hst.phx2.redhat.com> --===============2417797043685655634== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:25:55 -0400 (Fri, 25 Sep 2009) New Revision: 17752 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSFJSPLinkHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPBeanHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPBundleHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPCSSClassHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPConverterHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPExprHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPForIDHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPForwardHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPLoadBundleHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPNavigationCaseHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JsfJSPTagNameHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/t= ext/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.= MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 200= 9-09-25 15:18:59 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF 200= 9-09-25 15:25:55 UTC (rev 17752) @@ -10,6 +10,7 @@ org.eclipse.ui, org.eclipse.jface.text, org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, org.jboss.tools.jsf Export-Package: org.jboss.tools.jsf.text.ext, org.jboss.tools.jsf.text.ext.hyperlink Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSFJSPLinkHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSFJSPLinkHyperlinkPartitioner.java 2009-09-25 15:18:59 = UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSFJSPLinkHyperlinkPartitioner.java 2009-09-25 15:25:55 = UTC (rev 17752) @@ -18,7 +18,7 @@ import org.jboss.tools.jsf.project.JSFNature; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPLinkHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; = public class JSFJSPLinkHyperlinkPartitioner extends JSPLinkHyperlinkPartit= ioner { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPBeanHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPBeanHyperlinkPartitioner.java 2009-09-25 15:18:59 UTC= (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPBeanHyperlinkPartitioner.java 2009-09-25 15:25:55 UTC= (rev 17752) @@ -28,7 +28,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; = Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java 2009-09-25 15:18:59 U= TC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java 2009-09-25 15:25:55 U= TC (rev 17752) @@ -29,7 +29,7 @@ import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPCSSClassHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPCSSClassHyperlinkPartitioner.java 2009-09-25 15:18:59= UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPCSSClassHyperlinkPartitioner.java 2009-09-25 15:25:55= UTC (rev 17752) @@ -21,7 +21,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPConverterHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPConverterHyperlinkPartitioner.java 2009-09-25 15:18:5= 9 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPConverterHyperlinkPartitioner.java 2009-09-25 15:25:5= 5 UTC (rev 17752) @@ -21,7 +21,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-09-25 15:18:59 UTC= (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-09-25 15:25:55 UTC= (rev 17752) @@ -23,7 +23,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; = /** * @author Jeremy Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPForIDHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPForIDHyperlinkPartitioner.java 2009-09-25 15:18:59 UT= C (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPForIDHyperlinkPartitioner.java 2009-09-25 15:25:55 UT= C (rev 17752) @@ -22,7 +22,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPForwardHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPForwardHyperlinkPartitioner.java 2009-09-25 15:18:59 = UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPForwardHyperlinkPartitioner.java 2009-09-25 15:25:55 = UTC (rev 17752) @@ -24,7 +24,7 @@ import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPLoadBundleHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPLoadBundleHyperlinkPartitioner.java 2009-09-25 15:18:= 59 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPLoadBundleHyperlinkPartitioner.java 2009-09-25 15:25:= 55 UTC (rev 17752) @@ -24,7 +24,7 @@ import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPNavigationCaseHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPNavigationCaseHyperlinkPartitioner.java 2009-09-25 15= :18:59 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPNavigationCaseHyperlinkPartitioner.java 2009-09-25 15= :25:55 UTC (rev 17752) @@ -22,7 +22,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java 2009-09-25 15:18:5= 9 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java 2009-09-25 15:25:5= 5 UTC (rev 17752) @@ -23,7 +23,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java 2009-09-25 1= 5:18:59 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java 2009-09-25 1= 5:25:55 UTC (rev 17752) @@ -22,7 +22,7 @@ import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jsf.project.JSFNature; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2009-09-25 15:18:59 UTC (rev= 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2009-09-25 15:25:55 UTC (rev= 17752) @@ -21,7 +21,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java 2009-09-25 15:18:= 59 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java 2009-09-25 15:25:= 55 UTC (rev 17752) @@ -28,7 +28,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; = /** * @author Jeremy Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java 2009-09-25 15:18:59= UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java 2009-09-25 15:25:55= UTC (rev 17752) @@ -17,7 +17,7 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jsf.project.JSFNature; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tool= s/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java 2009-09-25 1= 5:18:59 UTC (rev 17751) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/= text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java 2009-09-25 1= 5:25:55 UTC (rev 17752) @@ -26,7 +26,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy --===============2417797043685655634==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:33:05 2009 Content-Type: multipart/mixed; boundary="===============5701116561031509591==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17753 - in trunk/struts/plugins/org.jboss.tools.struts.text.ext: src/org/jboss/tools/struts/text/ext/hyperlink and 1 other directory. Date: Fri, 25 Sep 2009 11:33:05 -0400 Message-ID: <200909251533.n8PFX5gd006923@svn01.web.mwc.hst.phx2.redhat.com> --===============5701116561031509591== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:33:04 -0400 (Fri, 25 Sep 2009) New Revision: 17753 Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsActionHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsActionMappingHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsBeanNameHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsBundleHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsBundleKeyHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsFormActionHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsFormBeanHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsForwardHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsJSPLinkHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsJSPTagNameHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsLogicPropertyHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsPageHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsPropertyHyperlinkPartitioner.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools= /struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlinkPartitioner.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MAN= IFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.= MF 2009-09-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/META-INF/MANIFEST.= MF 2009-09-25 15:33:04 UTC (rev 17753) @@ -16,6 +16,7 @@ org.eclipse.core.resources, org.jboss.tools.struts, org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, org.jboss.tools.jst.web, org.eclipse.wst.sse.core, org.jboss.tools.common.model, Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsActionHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsActionHyperlinkPartitioner.java 2009-09-2= 5 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsActionHyperlinkPartitioner.java 2009-09-2= 5 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = = /** Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlinkPartitioner.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsActionMappingHyperlinkPartitioner.java 20= 09-09-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsActionMappingHyperlinkPartitioner.java 20= 09-09-25 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = = /** Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java 2009-09-25 15:25:5= 5 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java 2009-09-25 15:33:0= 4 UTC (rev 17753) @@ -19,7 +19,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBeanNameHyperlinkPartitioner.java 2009-09= -25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBeanNameHyperlinkPartitioner.java 2009-09= -25 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsBundleHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBundleHyperlinkPartitioner.java 2009-09-2= 5 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBundleHyperlinkPartitioner.java 2009-09-2= 5 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBundleKeyHyperlinkPartitioner.java 2009-0= 9-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsBundleKeyHyperlinkPartitioner.java 2009-0= 9-25 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsFormActionHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsFormActionHyperlinkPartitioner.java 2009-= 09-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsFormActionHyperlinkPartitioner.java 2009-= 09-25 15:33:04 UTC (rev 17753) @@ -20,7 +20,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; = /** Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsFormBeanHyperlinkPartitioner.java 2009-09= -25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsFormBeanHyperlinkPartitioner.java 2009-09= -25 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsForwardHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsForwardHyperlinkPartitioner.java 2009-09-= 25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsForwardHyperlinkPartitioner.java 2009-09-= 25 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsJSPLinkHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsJSPLinkHyperlinkPartitioner.java 2009-09-= 25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsJSPLinkHyperlinkPartitioner.java 2009-09-= 25 15:33:04 UTC (rev 17753) @@ -18,7 +18,7 @@ import org.jboss.tools.struts.StrutsProject; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPLinkHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.w3c.dom.Document; = Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlinkPartitioner= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlinkPartitioner.java = 2009-09-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlinkPartitioner.java = 2009-09-25 15:33:04 UTC (rev 17753) @@ -21,7 +21,7 @@ import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.struts.StrutsProject; Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlinkPartitioner.java 2009-= 09-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlinkPartitioner.java 2009-= 09-25 15:33:04 UTC (rev 17753) @@ -20,7 +20,7 @@ import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.struts.StrutsProject; Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java 2009-09-25 15= :25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java 2009-09-25 15= :33:04 UTC (rev 17753) @@ -22,7 +22,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkParti= tioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlinkPartitioner.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlinkPartitioner.java 20= 09-09-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlinkPartitioner.java 20= 09-09-25 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsPageHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsPageHyperlinkPartitioner.java 2009-09-25 = 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsPageHyperlinkPartitioner.java 2009-09-25 = 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsPropertyHyperlinkPartitioner.java 2009-09= -25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsPropertyHyperlinkPartitioner.java 2009-09= -25 15:33:04 UTC (rev 17753) @@ -10,7 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.struts.text.ext.hyperlink; = -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; = /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jbos= s/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlinkPartitioner= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlinkPartitioner.java = 2009-09-25 15:25:55 UTC (rev 17752) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tool= s/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlinkPartitioner.java = 2009-09-25 15:33:04 UTC (rev 17753) @@ -17,7 +17,7 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPTagAttributeValueH= yperlinkPartitioner; +import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHype= rlinkPartitioner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.struts.StrutsProject; --===============5701116561031509591==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:57:37 2009 Content-Type: multipart/mixed; boundary="===============7456398037961086272==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17754 - in trunk/common/plugins/org.jboss.tools.common.text.ext: META-INF and 1 other directories. Date: Fri, 25 Sep 2009 11:57:37 -0400 Message-ID: <200909251557.n8PFvbH3012364@svn01.web.mwc.hst.phx2.redhat.com> --===============7456398037961086272== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:57:36 -0400 (Fri, 25 Sep 2009) New Revision: 17754 Removed: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/CSSClassHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/FilterNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/RoleNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/ServletNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/TLDAttributeNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools= /common/text/ext/hyperlink/jsp/ Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MAN= IFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.= MF 2009-09-25 15:33:04 UTC (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.= MF 2009-09-25 15:57:36 UTC (rev 17754) @@ -3,7 +3,6 @@ Bundle-Activator: org.jboss.tools.common.text.ext.ExtensionsPlugin Export-Package: org.jboss.tools.common.text.ext, org.jboss.tools.common.text.ext.hyperlink, - org.jboss.tools.common.text.ext.hyperlink.jsp, org.jboss.tools.common.text.ext.hyperlink.xml, org.jboss.tools.common.text.ext.hyperlink.xpl, org.jboss.tools.common.text.ext.util, Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2009-09= -25 15:33:04 UTC (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2009-09= -25 15:57:36 UTC (rev 17754) @@ -10,19 +10,6 @@ id=3D"org.jboss.tools.common.text.ext.hyperlinkPartitioner" name=3D"org.jboss.tools.common.text.ext.hyperlinkPartitioner"> = - - - - - - - - - - - = - - - - - - - - - = = @@ -252,176 +228,6 @@ = = - = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - - - - - - - - = - - - - - - - - - = - - - - - - - - = - - - - - - - - = - - - - - - - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - - = - - = - - = - - - - - = @@ -748,62 +535,7 @@ = = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -833,17 +565,6 @@ = - - - - - - - - - @@ -869,100 +590,7 @@ = - - = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/CSSClassHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/CSSClassHyperlink.java 2009-09-25 15:33:04 UTC = (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/CSSClassHyperlink.java 2009-09-25 15:57:36 UTC = (rev 17754) @@ -1,508 +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.text.ext.hyperlink; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.ide.IDE; -import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvid= eAdapter; -import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetA= dapter; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRul= e; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleShe= et; -import org.eclipse.wst.html.core.internal.htmlcss.LinkElementAdapter; -import org.eclipse.wst.html.core.internal.htmlcss.URLModelProvider; -import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; -import org.jboss.tools.common.text.ext.util.RegionHolder; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.css.CSSRule; -import org.w3c.dom.css.CSSRuleList; -import org.w3c.dom.css.CSSStyleSheet; - -/** - * @author Jeremy - */ -public class CSSClassHyperlink extends AbstractHyperlink { - - public static final String[] STYLE_TAGS =3D new String[] { "style", "link= " }; //$NON-NLS-1$//$NON-NLS-2$ - public static final String LINK_TAG =3D "link"; //$NON-NLS-1$ - public static final String HREF_ATTRIBUTE =3D "href"; //$NON-NLS-1$ - public static final String COMPARE_CLASS_REGEX_PREFIX =3D "[\\.]?"; //$NO= N-NLS-1$ - public static final String CONTEXT_PATH_EXPRESSION =3D "^\\s*(\\#|\\$)\\{= facesContext.externalContext.requestContextPath\\}"; //$NON-NLS-1$ - - /** - * = - */ - protected void doHyperlink(IRegion region) { - - IDOMModel model =3D (IDOMModel) getModelManager() - .getExistingModelForRead(getDocument()); - - // get name of looked for style - String styleName =3D getStyleName(region); - - // get elements which copntans information about styles (style and link - // tags) - List styleElementList =3D getStyleContainerList(model); - - // sort nodes by position in inverse order - from larger position to - // smaller - Collections.sort(styleElementList, new Comparator() { - - public int compare(Node o1, Node o2) { - return ((IDOMNode) o2).getStartOffset() - - ((IDOMNode) o1).getStartOffset(); - } - - }); - - RegionHolder styleRegion =3D null; - // look for style in each Style element - for (Node styleContainer : styleElementList) { - - styleRegion =3D findStyleRegion(styleContainer, styleName); - - if (styleRegion !=3D null) { - showRegion(styleRegion); - break; - } - - } - - model.releaseFromRead(); - } - - /** - * = - * @param model - * @return - */ - private List getStyleContainerList(IDOMModel model) { - - // get model of current page - IDOMDocument document =3D model.getDocument(); - - List getStyleContainerList =3D new ArrayList(); - - // get all tags which contains style ( link, style) - for (String tagName : STYLE_TAGS) { - getStyleContainerList.addAll(getList(document - .getElementsByTagName(tagName))); - } - - return getStyleContainerList; - } - - /** - * move nodes from NodeList to List - * = - * @param nodeList - * @return - */ - List getList(NodeList nodeList) { - - List newContainerList =3D new ArrayList(); - for (int i =3D 0; i < nodeList.getLength(); i++) { - newContainerList.add(nodeList.item(i)); - } - return newContainerList; - } - - /** - * = - * @param stylesContainer - * @param styleName - * @return - */ - public RegionHolder findStyleRegion(Node stylesContainer, String styleNam= e) { - - // get style sheet - CSSStyleSheet sheet =3D getSheet(stylesContainer); - - if (sheet !=3D null) { - - CSSRuleList ruleList =3D sheet.getCssRules(); - - // for each cssRule - for (int i =3D 0; i < ruleList.getLength(); i++) { - - CSSRule cssRule =3D ruleList.item(i); - - // if cssRule describe looked for style - if (isRuleMatch(cssRule, styleName)) { - - return new RegionHolder(getFile((ICSSNode) cssRule), - getRegion(cssRule)); - - } - } - - } - return null; - } - - /** - * = - * @param stylesContainer - * @return - */ - private CSSStyleSheet getSheet(final Node stylesContainer) { - - INodeNotifier notifier =3D (INodeNotifier) stylesContainer; - - IStyleSheetAdapter adapter =3D (IStyleSheetAdapter) notifier - .getAdapterFor(IStyleSheetAdapter.class); - - if (LINK_TAG.equalsIgnoreCase(stylesContainer.getNodeName()) - && !(adapter instanceof ExtendedLinkElementAdapter)) { - - notifier.removeAdapter(adapter); - adapter =3D new ExtendedLinkElementAdapter( - (Element) stylesContainer); - notifier.addAdapter(adapter); - - } - - CSSStyleSheet sheet =3D null; - - if (adapter !=3D null) { - sheet =3D (CSSStyleSheet) adapter.getSheet(); - - } - - return sheet; - - } - - protected String processURL(String href) { - // TODO Auto-generated method stub - return null; - } - - /** - * = - * @param cssRule - * @param styleName - * @return - */ - private boolean isRuleMatch(CSSRule cssRule, String styleName) { - - // get selector text - String selectorText =3D ((ICSSStyleRule) cssRule).getSelectorText(); - - if (selectorText !=3D null) { - - // split selector text by whitespace - String[] styles =3D selectorText.trim().split(" "); //$NON-NLS-1$ - int searchIndex =3D Arrays.binarySearch(styles, styleName, - new Comparator() { - - public int compare(String o1, String o2) { - Matcher matcher =3D Pattern.compile( - COMPARE_CLASS_REGEX_PREFIX + o2) - .matcher(o1); - return matcher.matches() ? 0 : 1; - } - - }); - if (searchIndex >=3D 0) - return true; - } - return false; - } - - /** - * = - * @param node - * @return - */ - private IFile getFile(ICSSNode node) { - - ICSSDocument sheet =3D node.getOwnerDocument(); - - return AbstractHyperlink.getFile(sheet.getModel()); - } - - /** - * = - * @param cssRule - * @return - */ - protected Region getRegion(CSSRule cssRule) { - - int offset =3D ((IndexedRegion) cssRule).getStartOffset(); - - // if css rule is contained in style tag so it is require to take into - // account offset of this tag - ICSSStyleSheet document =3D (ICSSStyleSheet) ((ICSSStyleRule) cssRule) - .getOwnerDocument(); - - ICSSModel model =3D document.getModel(); - - // get style tag - Node node =3D model.getOwnerDOMNode(); - - // increase offset - if (node instanceof IDOMElement) - offset +=3D ((IDOMElement) node).getStartEndOffset(); - - return new Region(offset, 0); - - } - - /** - * = - * @param styleRegion - */ - private void showRegion(RegionHolder styleRegion) { - - IWorkbenchPage workbenchPage =3D ExtensionsPlugin.getDefault() - .getWorkbench().getActiveWorkbenchWindow().getActivePage(); - IEditorPart part =3D null; - if (styleRegion.file !=3D null) { - try { - part =3D IDE.openEditor(workbenchPage, styleRegion.file, true); - } catch (PartInitException e) { - e.printStackTrace(); - } - if (part =3D=3D null) { - openFileFailed(); - return; - } - } - StructuredSelectionHelper.setSelectionAndReveal(part, - styleRegion.region); - } - - /** - * = - * @param region - * @return - */ - private String getStyleName(IRegion region) { - try { - return getDocument().get(region.getOffset(), region.getLength()); - } catch (BadLocationException e) { - return null; - } - } - - IRegion fLastRegion =3D null; - - /** - * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) - */ - protected IRegion doGetHyperlinkRegion(int offset) { - fLastRegion =3D getRegion(offset); - return fLastRegion; - } - - /** - * TODO research method - * = - * @param offset - * @return - */ - protected IRegion getRegion(int offset) { - StructuredModelWrapper smw =3D new StructuredModelWrapper(); - try { - smw.init(getDocument()); - Document xmlDocument =3D smw.getDocument(); - if (xmlDocument =3D=3D null) - return null; - - Node n =3D Utils.findNodeForOffset(xmlDocument, offset); - - if (n =3D=3D null || !(n instanceof Attr)) - return null; - int start =3D Utils.getValueStart(n); - int end =3D Utils.getValueEnd(n); - if (start > offset) - return null; - - String attrText =3D getDocument().get(start, end - start); - - StringBuffer sb =3D new StringBuffer(attrText); - // find start of bean property - int bStart =3D offset - start; - while (bStart >=3D 0) { - if (!Character.isJavaIdentifierPart(sb.charAt(bStart)) - && sb.charAt(bStart) !=3D '_' && sb.charAt(bStart) !=3D '-' - && sb.charAt(bStart) !=3D '.') { - bStart++; - break; - } - - if (bStart =3D=3D 0) - break; - bStart--; - } - // find end of bean property - int bEnd =3D offset - start; - while (bEnd < sb.length()) { - if (!Character.isJavaIdentifierPart(sb.charAt(bEnd)) - && sb.charAt(bEnd) !=3D '_' && sb.charAt(bEnd) !=3D '-' - && sb.charAt(bEnd) !=3D '.') - break; - bEnd++; - } - - final int propStart =3D bStart + start; - final int propLength =3D bEnd - bStart; - - if (propStart > offset || propStart + propLength < offset) - return null; - return new Region(propStart, propLength); - } catch (BadLocationException x) { - // ignore - return null; - } finally { - smw.dispose(); - } - } - - /* - * (non-Javadoc) - * = - * @see IHyperlink#getHyperlinkText() - */ - public String getHyperlinkText() { - String styleName =3D getStyleName(fLastRegion); - if (styleName =3D=3D null) - return MessageFormat.format(Messages.OpenA, Messages.CSSStyle); - - return MessageFormat.format(Messages.OpenCSSStyle, styleName); - } - - @Override - protected String findAndReplaceElVariable(String fileName) { - if (fileName !=3D null) - fileName =3D fileName - .replaceFirst( - "^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\= }", - ""); - return super.findAndReplaceElVariable(fileName); - } - - public class ExtendedLinkElementAdapter extends LinkElementAdapter { - - private Element element; - - public ExtendedLinkElementAdapter(Element element) { - this.element =3D element; - } - - @Override - public Element getElement() { - return element; - } - - @Override - protected boolean isValidAttribute() { - String href =3D getElement().getAttribute(HREF_ATTRIBUTE); - if (href =3D=3D null || href.length() =3D=3D 0) - return false; - return true; - } - - /** - */ - public ICSSModel getModel() { - ICSSModel model =3D super.getModel(); - if (model =3D=3D null) { - model =3D retrieveModel(); - setModel(model); - } - return model; - } - - /** - */ - private ICSSModel retrieveModel() { - if (!isValidAttribute()) { - return null; - } - - // null,attr check is done in isValidAttribute() - Element element =3D getElement(); - String href =3D findAndReplaceElVariable(element - .getAttribute(HREF_ATTRIBUTE)); - - IDOMModel baseModel =3D ((IDOMNode) element).getModel(); - if (baseModel =3D=3D null) - return null; - Object id =3D baseModel.getId(); - if (!(id instanceof String)) - return null; - // String base =3D (String)id; - - // get ModelProvideAdapter - IModelProvideAdapter adapter =3D (IModelProvideAdapter) ((INodeNotifier= ) getElement()) - .getAdapterFor(IModelProvideAdapter.class); - - URLModelProvider provider =3D new URLModelProvider(); - try { - IStructuredModel newModel =3D provider.getModelForRead(baseModel, - href); - if (newModel =3D=3D null) - return null; - if (!(newModel instanceof ICSSModel)) { - newModel.releaseFromRead(); - return null; - } - - // notify adapter - if (adapter !=3D null) - adapter.modelProvided(newModel); - - return (ICSSModel) newModel; - } catch (UnsupportedEncodingException e) { - } catch (IOException e) { - } - - return null; - } - } - -} \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java 2009-09-25 15= :33:04 UTC (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/CSSClassHyperlinkPartitioner.java 2009-09-25 15= :57:36 UTC (rev 17754) @@ -1,84 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.common.text.ext.hyperlink; - -import org.eclipse.jface.text.IDocument; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitio= ner; -import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; -import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; -import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -/** - * = - * @author Sergey Dzmitrovich - * - */ -public class CSSClassHyperlinkPartitioner extends - AbstractHyperlinkPartitioner implements IHyperlinkPartitionRecognizer { - - public static final String CSS_CLASS_PARTITION =3D "org.jboss.tools.commo= n.text.ext.CSS_CLASS"; //$NON-NLS-1$ - - private static final String CSS_CLASS_TOKEN =3D "class/"; //$NON-NLS-1$ - - /** - * @see com.ibm.sse.editor.hyperlink.AbstractHyperlinkPartitioner#parse(o= rg.eclipse.jface.text.IDocument, - * com.ibm.sse.editor.extensions.hyperlink.IHyperlinkRegion) - */ - protected IHyperlinkRegion parse(IDocument document, - IHyperlinkRegion superRegion) { - StructuredModelWrapper smw =3D new StructuredModelWrapper(); - try { - smw.init(document); - Document xmlDocument =3D smw.getDocument(); - if (xmlDocument =3D=3D null) - return null; - - Node n =3D Utils.findNodeForOffset(xmlDocument, superRegion - .getOffset()); - if (n =3D=3D null || !(n instanceof Attr)) - return null; - - String axis =3D getAxis(document, superRegion); - String contentType =3D superRegion.getContentType(); - String type =3D getPartitionType(axis); - int start =3D Utils.getValueStart(n); - int end =3D Utils.getValueEnd(n); - if (start < 0 || end < start) - return null; - int length =3D end - start; - int offset =3D superRegion.getOffset(); - - IHyperlinkRegion region =3D new HyperlinkRegion(offset, length, axis, - contentType, type); - return region; - } finally { - smw.dispose(); - } - } - - private String getPartitionType(String axis) { - return CSS_CLASS_PARTITION; - } - - public boolean recognize(IDocument document, IHyperlinkRegion region) { - - if (region.getAxis() !=3D null - && region.getAxis().toLowerCase().endsWith(CSS_CLASS_TOKEN)) - return true; - return false; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/FilterNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/FilterNameHyperlink.java 2009-09-25 15:33:04 UT= C (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/FilterNameHyperlink.java 2009-09-25 15:57:36 UT= C (rev 17754) @@ -1,34 +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.text.ext.hyperlink; - -import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; -/** - * @author Jeremy - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class FilterNameHyperlink extends JumpToHyperlink { - protected String getDestinationAxis() { - return "/web-app/filter/filter-name/"; //$NON-NLS-1$ - } - = - /* - * (non-Javadoc) - * = - * @see IHyperlink#getHyperlinkText() - */ - public String getHyperlinkText() { - return Messages.BrowseToFilterNameDefinition; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java 2009-09-25 1= 5:33:04 UTC (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java 2009-09-25 1= 5:57:36 UTC (rev 17754) @@ -1,109 +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.text.ext.hyperlink; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Region; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; - -/** - * @author Jeremy - * - */ -public class JSPStylesheetRelLinkHyperlink extends RelativeLinkHyperlink { - = - private static final String HREF_ATTRNAME =3D "href"; //$NON-NLS-1$ - - protected IRegion getRegion (int offset) { - StructuredModelWrapper smw =3D new StructuredModelWrapper(); - smw.init(getDocument()); - try { - Document xmlDocument =3D smw.getDocument(); - if (xmlDocument =3D=3D null) return null; - = - Node n =3D Utils.findNodeForOffset(xmlDocument, offset); - = - if (n =3D=3D null || !(n instanceof Text || n instanceof Attr)) return = null; - = - String text =3D null; - int bStart =3D 0; - int bEnd =3D 0; - = - if (n instanceof Text) { - int start =3D Utils.getValueStart(n); - int end =3D Utils.getValueEnd(n); - if (start < 0 || start > offset) return null; - = - text =3D getDocument().get(start, end - start); - bStart =3D offset - start; - bEnd =3D offset - start; - } else if (n instanceof Attr) { - Attr attr =3D (Attr)n; - if (!HREF_ATTRNAME.equalsIgnoreCase(attr.getName())) return null; - int start =3D Utils.getValueStart(n); - int end =3D Utils.getValueEnd(n); - if(start < 0) return null; - = - text =3D getDocument().get(start, end - start); - bStart =3D offset - start; - bEnd =3D offset - start; - } - StringBuffer sb =3D new StringBuffer(text); - //find start of bean property - while (bStart >=3D 0) { = - if (!Character.isJavaIdentifierPart(sb.charAt(bStart)) && - sb.charAt(bStart) !=3D '\\' && sb.charAt(bStart) !=3D '/' && - sb.charAt(bStart) !=3D ':' && sb.charAt(bStart) !=3D '-' && - sb.charAt(bStart) !=3D '.' && sb.charAt(bStart) !=3D '_' && - sb.charAt(bStart) !=3D '%' && sb.charAt(bStart) !=3D '?' && - sb.charAt(bStart) !=3D '&' && sb.charAt(bStart) !=3D '=3D') { - bStart++; - break; - } - = - if (bStart =3D=3D 0) break; - bStart--; - } - // find end of bean property - while (bEnd >=3D 0 && bEnd < sb.length()) { = - if (!Character.isJavaIdentifierPart(sb.charAt(bEnd)) && - sb.charAt(bEnd) !=3D '\\' && sb.charAt(bEnd) !=3D '/' && - sb.charAt(bEnd) !=3D ':' && sb.charAt(bEnd) !=3D '-' && - sb.charAt(bEnd) !=3D '.' && sb.charAt(bEnd) !=3D '_' && - sb.charAt(bEnd) !=3D '%' && sb.charAt(bEnd) !=3D '?' && - sb.charAt(bEnd) !=3D '&' && sb.charAt(bEnd) !=3D '=3D') { - break; - } - bEnd++; - } - = - final int propStart =3D bStart + Utils.getValueStart(n); - final int propLength =3D bEnd - bStart; - = - if (propStart > offset || propStart + propLength < offset) return null; - = - return new Region(propStart,propLength); - } catch (BadLocationException x) { - //ignore - return null; - } finally { - smw.dispose(); - } - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/RoleNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/RoleNameHyperlink.java 2009-09-25 15:33:04 UTC = (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/RoleNameHyperlink.java 2009-09-25 15:57:36 UTC = (rev 17754) @@ -1,36 +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.text.ext.hyperlink; - -import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; - - -/** - * @author Jeremy - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class RoleNameHyperlink extends JumpToHyperlink { - protected String getDestinationAxis() { - return "/web-app/security-role/role-name/"; //$NON-NLS-1$ - } - = - /* - * (non-Javadoc) - * = - * @see IHyperlink#getHyperlinkText() - */ - public String getHyperlinkText() { - return Messages.BrowseToRoleNameDefinition; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/ServletNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/ServletNameHyperlink.java 2009-09-25 15:33:04 U= TC (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/ServletNameHyperlink.java 2009-09-25 15:57:36 U= TC (rev 17754) @@ -1,36 +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.text.ext.hyperlink; - -import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; - - -/** - * @author Jeremy - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class ServletNameHyperlink extends JumpToHyperlink { - protected String getDestinationAxis() { - return "/web-app/servlet/servlet-name/"; //$NON-NLS-1$ - } - = - /* - * (non-Javadoc) - * = - * @see IHyperlink#getHyperlinkText() - */ - public String getHyperlinkText() { - return Messages.BrowseToServletNameDefinition; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java 2009-09-25 15:33= :04 UTC (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java 2009-09-25 15:57= :36 UTC (rev 17754) @@ -1,89 +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.text.ext.hyperlink; - -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import org.eclipse.jface.text.IRegion; -import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * @author Jeremy - * - */ -public class TLDAttributeNameHyperlink extends JumpToHyperlink { - protected String getDestinationAxis() { - return "/taglib/tag/attribute/name/"; //$NON-NLS-1$ - } - = - protected NodeList getRootElementsToSearch (IRegion region) { - StructuredModelWrapper smw =3D new StructuredModelWrapper(); - try { - smw.init(getDocument()); - Document xmlDocument =3D smw.getDocument(); - if (xmlDocument =3D=3D null) return null; - - Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); - - Element tagElement =3D null; - while(n !=3D null && tagElement =3D=3D null) { - n =3D n.getParentNode(); - if (n instanceof Element && validAxis(n, "/taglib/tag/")) { //$NON-NLS= -1$ - tagElement =3D (Element)n; - } - } - if (tagElement =3D=3D null) - return null; - = - return tagElement.getChildNodes(); - } finally { - smw.dispose(); - } - } - = - private boolean validAxis(Node n, String validAxisEnding) { - if (validAxisEnding =3D=3D null || validAxisEnding.lastIndexOf('/') =3D= =3D -1) return false; - StringTokenizer st =3D new StringTokenizer(validAxisEnding, "/"); //$NON= -NLS-1$ - List tokens =3D new ArrayList(); - while (st.hasMoreTokens()) { - tokens.add(st.nextToken()); - } - if (tokens.size() =3D=3D 0) return false; - Node currentElement =3D n; - for (int i =3D tokens.size() - 1; i >=3D 0; i--) { - if (currentElement =3D=3D null || !(currentElement instanceof Element)) - return false; - String token =3D (String)tokens.get(i); - if (!token.equals(currentElement.getNodeName())) - return false; - currentElement =3D currentElement.getParentNode(); - } - return true; - } - - /* - * (non-Javadoc) - * = - * @see IHyperlink#getHyperlinkText() - */ - public String getHyperlinkText() { - return Messages.BrowseToTLDAttributeNameDeclaration; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss= /tools/common/text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.java = 2009-09-25 15:33:04 UTC (rev 17753) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tool= s/common/text/ext/hyperlink/TaglibDefinitionFilesHyperlinkPartitioner.java = 2009-09-25 15:57:36 UTC (rev 17754) @@ -1,57 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.common.text.ext.hyperlink; - -import org.eclipse.jface.text.IDocument; -import org.jboss.tools.common.text.ext.hyperlink.xml.XMLClassHyperlinkPart= itioner; -import org.jboss.tools.common.text.ext.hyperlink.xml.XMLTextHyperlinkParti= tioner; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - -/** - * @author mareshkau - * - */ -public class TaglibDefinitionFilesHyperlinkPartitioner extends XMLTextHype= rlinkPartitioner { - - public static final String TAGLIB_XML_PARTITION =3D "org.jboss.tools.comm= on.text.ext.xml.TAGLIB_XML"; //$NON-NLS-1$ - /* (non-Javadoc) - * @see org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartit= ioner#parse(org.eclipse.jface.text.IDocument, org.jboss.tools.common.text.e= xt.hyperlink.IHyperlinkRegion) - */ - /** - * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) - */ - @Override - public boolean recognize(IDocument document, IHyperlinkRegion region) { - StructuredModelWrapper smw =3D new StructuredModelWrapper(); - try { - smw.init(document); - Document xmlDocument =3D smw.getDocument(); - if (xmlDocument =3D=3D null) return false; - = - Node n =3D Utils.findNodeForOffset(xmlDocument, region.getOffset()); - return (n instanceof Text); - } finally { - smw.dispose(); - } - } - - @Override - protected String getPartitionType(String axis) { - if(axis!=3Dnull && axis.contains("class")) { //$NON-NLS-1$ - return XMLClassHyperlinkPartitioner.XML_CLASS_PARTITION; - } - return TAGLIB_XML_PARTITION; - } -} --===============7456398037961086272==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 11:59:22 2009 Content-Type: multipart/mixed; boundary="===============4488341424213271317==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17755 - in trunk/jst/plugins/org.jboss.tools.jst.text.ext: src/org/jboss/tools/jst/text/ext/hyperlink/jsp and 1 other directory. Date: Fri, 25 Sep 2009 11:59:22 -0400 Message-ID: <200909251559.n8PFxMJJ012613@svn01.web.mwc.hst.phx2.redhat.com> --===============4488341424213271317== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 11:59:22 -0400 (Fri, 25 Sep 2009) New Revision: 17755 Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/t= ext/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2009-09-25 15= :57:36 UTC (rev 17754) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2009-09-25 15= :59:22 UTC (rev 17755) @@ -2,4 +2,391 @@ = + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + = + + = + + = + + + + + = + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + = + + + + + + + + + = + + + + + + + + = + + + + + + + + = + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tool= s/jst/text/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java 2009-09-25 15:5= 7:36 UTC (rev 17754) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/= text/ext/hyperlink/jsp/JSPCSSClassHyperlinkPartitioner.java 2009-09-25 15:5= 9:22 UTC (rev 17755) @@ -23,7 +23,7 @@ import org.jboss.tools.common.text.ext.util.Utils; = /** - * * @deprecated see org.jboss.tools.common.text.ext.hyperlink.CSSClassHy= perlinkPartitioner + * * @deprecated see org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyper= linkPartitioner * @author Jeremy */ public class JSPCSSClassHyperlinkPartitioner extends AbstractHyperlinkPart= itioner /*implements IHyperlinkPartitionRecognizer */{ --===============4488341424213271317==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:04:52 2009 Content-Type: multipart/mixed; boundary="===============5718896206621113874==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17756 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd. Date: Fri, 25 Sep 2009 12:04:52 -0400 Message-ID: <200909251604.n8PG4qLc014100@svn01.web.mwc.hst.phx2.redhat.com> --===============5718896206621113874== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 12:04:52 -0400 (Fri, 25 Sep 2009) New Revision: 17756 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/DropUtils.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/DropUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropUtils.java 2009-09-25 15:59:22 UTC (rev 1= 7755) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/DropUtils.java 2009-09-25 16:04:52 UTC (rev 1= 7756) @@ -18,6 +18,7 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; import org.jboss.tools.common.model.XModelObject; @@ -25,8 +26,6 @@ import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributes= Composite; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.tld.IWebProject; -import org.jboss.tools.jst.web.tld.WebProjectFactory; = /** * = @@ -94,8 +93,10 @@ container =3D (IContainer)EclipseResourceUtil.getResource(o); } if(container =3D=3D null) { - IWebProject p =3D WebProjectFactory.instance.getWebProject(modelNature.= getModel()); - container =3D ResourcesPlugin.getWorkspace().getRoot().getContainerForL= ocation(new Path(p.getWebRootLocation())); + IResource r =3D EclipseResourceUtil.getFirstWebContentResource(project); + if(r instanceof IContainer) { + container =3D (IContainer)r; + } } return container; } --===============5718896206621113874==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:09:21 2009 Content-Type: multipart/mixed; boundary="===============4317823453539376578==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17757 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld. Date: Fri, 25 Sep 2009 12:09:21 -0400 Message-ID: <200909251609.n8PG9LXI015144@svn01.web.mwc.hst.phx2.redhat.com> --===============4317823453539376578== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 12:09:21 -0400 (Fri, 25 Sep 2009) New Revision: 17757 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/ITaglibMapping.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/IWebProject.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/IWebProjectFactory.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/WebProjectFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/ITaglibMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/ITaglibMapping.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/ITaglibMapping.java 2009-09-25 16:09:21 UTC (rev 17757) @@ -0,0 +1,21 @@ +/*************************************************************************= ****** + * 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 org.jboss.tools.common.model.XModelObject; + +public interface ITaglibMapping { + public XModelObject getTaglibObject(String uri); + public void invalidate(); + public String getTaglibPath(String uri); + public String resolveURI(String uri); + = +} Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/IWebProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/IWebProject.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/IWebProject.java 2009-09-25 16:09:21 UTC (rev 17757) @@ -0,0 +1,19 @@ +/*************************************************************************= ****** + * 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 org.jboss.tools.common.model.XModelObject; + +public interface IWebProject { + public ITaglibMapping getTaglibMapping(); + public String getWebRootLocation(); + public String getPathInWebRoot(XModelObject o); +} Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/IWebProjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/IWebProjectFactory.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/IWebProjectFactory.java 2009-09-25 16:09:21 UTC (rev 17757) @@ -0,0 +1,17 @@ +/*************************************************************************= ****** + * 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 org.jboss.tools.common.model.XModel; + +public interface IWebProjectFactory { + public IWebProject getWebProject(XModel model); +} Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/WebProjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/WebProjectFactory.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/WebProjectFactory.java 2009-09-25 16:09:21 UTC (rev 17757) @@ -0,0 +1,25 @@ +/*************************************************************************= ****** + * 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 org.jboss.tools.common.model.plugin.ModelPlugin; +import org.jboss.tools.common.model.util.ModelFeatureFactory; + +public class WebProjectFactory { + public static IWebProjectFactory instance =3D null; + static { + try { + instance =3D (IWebProjectFactory)ModelFeatureFactory.getInstance().crea= teFeatureInstance("org.jboss.tools.jst.web.tld.WebProjectFactoryImpl"); //$= NON-NLS-1$ + } catch (ClassCastException e) { + ModelPlugin.getPluginLog().logError(e); + } + } +} --===============4317823453539376578==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:09:47 2009 Content-Type: multipart/mixed; boundary="===============6946343272098994854==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17758 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF. Date: Fri, 25 Sep 2009 12:09:47 -0400 Message-ID: <200909251609.n8PG9lEZ015213@svn01.web.mwc.hst.phx2.redhat.com> --===============6946343272098994854== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 12:09:46 -0400 (Fri, 25 Sep 2009) New Revision: 17758 Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.= MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 200= 9-09-25 16:09:21 UTC (rev 17757) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 200= 9-09-25 16:09:46 UTC (rev 17758) @@ -14,6 +14,7 @@ Bundle-Localization: plugin Require-Bundle: org.jboss.tools.common.model, org.jboss.tools.common.text.ext, + org.jboss.tools.jst.web, org.eclipse.ui.ide, org.eclipse.ui, org.eclipse.jface.text, --===============6946343272098994854==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:10:33 2009 Content-Type: multipart/mixed; boundary="===============2201271264472567053==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17759 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld. Date: Fri, 25 Sep 2009 12:10:33 -0400 Message-ID: <200909251610.n8PGAXSY015603@svn01.web.mwc.hst.phx2.redhat.com> --===============2201271264472567053== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 12:10:32 -0400 (Fri, 25 Sep 2009) New Revision: 17759 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/ITaglibMapping.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/IWebProject.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/IWebProjectFactory.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/WebProjectFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/ITaglibMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/ITaglibMapping.java 2009-09-25 16:09:46 UTC (rev 17758) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/ITaglibMapping.java 2009-09-25 16:10:32 UTC (rev 17759) @@ -1,21 +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 org.jboss.tools.common.model.XModelObject; - -public interface ITaglibMapping { - public XModelObject getTaglibObject(String uri); - public void invalidate(); - public String getTaglibPath(String uri); - public String resolveURI(String uri); - = -} Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/IWebProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/IWebProject.java 2009-09-25 16:09:46 UTC (rev 17758) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/IWebProject.java 2009-09-25 16:10:32 UTC (rev 17759) @@ -1,19 +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 org.jboss.tools.common.model.XModelObject; - -public interface IWebProject { - public ITaglibMapping getTaglibMapping(); - public String getWebRootLocation(); - public String getPathInWebRoot(XModelObject o); -} Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/IWebProjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/IWebProjectFactory.java 2009-09-25 16:09:46 UTC (rev 17758) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/IWebProjectFactory.java 2009-09-25 16:10:32 UTC (rev 17759) @@ -1,17 +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 org.jboss.tools.common.model.XModel; - -public interface IWebProjectFactory { - public IWebProject getWebProject(XModel model); -} Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/WebProjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/WebProjectFactory.java 2009-09-25 16:09:46 UTC (rev 17758) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/WebProjectFactory.java 2009-09-25 16:10:32 UTC (rev 17759) @@ -1,25 +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 org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ModelFeatureFactory; - -public class WebProjectFactory { - public static IWebProjectFactory instance =3D null; - static { - try { - instance =3D (IWebProjectFactory)ModelFeatureFactory.getInstance().crea= teFeatureInstance("org.jboss.tools.jst.web.tld.WebProjectFactoryImpl"); //$= NON-NLS-1$ - } catch (ClassCastException e) { - ModelPlugin.getPluginLog().logError(e); - } - } -} --===============2201271264472567053==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:14:10 2009 Content-Type: multipart/mixed; boundary="===============6089024843311567190==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17760 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context. Date: Fri, 25 Sep 2009 12:14:10 -0400 Message-ID: <200909251614.n8PGEAbp016180@svn01.web.mwc.hst.phx2.redhat.com> --===============6089024843311567190== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 12:14:10 -0400 (Fri, 25 Sep 2009) New Revision: 17760 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools= /common/model/ui/editors/dnd/context/DropContext.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jbos= s/tools/common/model/ui/editors/dnd/context/DropContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/context/DropContext.java 2009-09-25 16:10:32 = UTC (rev 17759) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tool= s/common/model/ui/editors/dnd/context/DropContext.java 2009-09-25 16:14:10 = UTC (rev 17760) @@ -38,7 +38,6 @@ import org.jboss.tools.common.model.ui.dnd.VpeTextDropAction; import org.jboss.tools.common.model.ui.editors.dnd.DropUtils; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.tld.TLDUtil; = /** * @author glory @@ -171,11 +170,21 @@ private boolean dropAsFileObject(XModelObject o) { if(o =3D=3D null) return false; if(o.getFileType() !=3D XModelObject.FILE || isOverAttributeValue) retur= n false; - if(TLDUtil.isTaglib(o)) return false; + if(isTaglib(o)) return false; String extension =3D o.getAttributeValue("extension"); //$NON-NLS-1$ return extension !=3D null && isExtensionMapped(extension); } - = + + //TODO do not reference tld here + //TLDUtil.isTaglib(o) + static String FILE_ENTITIES =3D ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.= FileTLD_2_1."; //$NON-NLS-1$ + public static boolean isTaglib(XModelObject o) { + return isOfEntity(o, FILE_ENTITIES); + } + private static boolean isOfEntity(XModelObject o, String entities) { + return entities.indexOf("." + o.getModelEntity().getName() + ".") = >=3D 0; //$NON-NLS-1$//$NON-NLS-2$ + } + class TransferHolder { Transfer transfer; TransferProcessor processor; --===============6089024843311567190==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:21:56 2009 Content-Type: multipart/mixed; boundary="===============4491691938055317110==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17761 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/jst/web/tld and 1 other directory. Date: Fri, 25 Sep 2009 12:21:56 -0400 Message-ID: <200909251621.n8PGLuGk018220@svn01.web.mwc.hst.phx2.redhat.com> --===============4491691938055317110== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 12:21:56 -0400 (Fri, 25 Sep 2009) New Revision: 17761 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/js= t/web/tld/TLDUtil.java Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFE= ST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF = 2009-09-25 16:14:10 UTC (rev 17760) +++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF = 2009-09-25 16:21:56 UTC (rev 17761) @@ -59,7 +59,6 @@ org.jboss.tools.common.model.loaders.impl, org.jboss.tools.common.model.search, org.jboss.tools.common.model.search.impl, - org.jboss.tools.jst.web.tld, images, org.jboss.tools.common.model.refactoring Require-Bundle: org.jboss.tools.common;visibility:=3Dreexport, Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/to= ols/jst/web/tld/TLDUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/TLDUtil.java 2009-09-25 16:14:10 UTC (rev 17760) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/j= st/web/tld/TLDUtil.java 2009-09-25 16:21:56 UTC (rev 17761) @@ -1,51 +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 org.jboss.tools.common.model.*; - -public class TLDUtil { - static String FILE_ENTITIES =3D ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.= FileTLD_2_1."; //$NON-NLS-1$ - static String TAG_ENTITIES =3D ".TLDTag.TLDTag12.TLDTag21."; //$NON-NL= S-1$ - static String ATTR_ENTITIES =3D ".TLDAttribute.TLDAttribute12."; //$NO= N-NLS-1$ - - public static boolean isTaglib(XModelObject o) { - return isOfEntity(o, FILE_ENTITIES); - } - - public static boolean isTag(XModelObject o) { - return isOfEntity(o, TAG_ENTITIES); - } - - public static boolean isAttribute(XModelObject o) { - return isOfEntity(o, ATTR_ENTITIES); - } - - private static boolean isOfEntity(XModelObject o, String entities) { - return entities.indexOf("." + o.getModelEntity().getName() + ".") = >=3D 0; //$NON-NLS-1$//$NON-NLS-2$ - } - - public static String getTagDescription(XModelObject o) { - String attr =3D (o.getModelEntity().getAttribute("info") !=3D null= ) ? "info" : "description"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - String s =3D o.getAttributeValue(attr); - s =3D (s =3D=3D null) ? "" : s.trim(); //$NON-NLS-1$ - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 0; i < s.length(); i++) { - char c =3D s.charAt(i); - if(c =3D=3D '<') sb.append("<"); //$NON-NLS-1$ - else if(c =3D=3D '>') sb.append(">"); //$NON-NLS-1$ - else sb.append(c); - } - return sb.toString(); - } - = -} - --===============4491691938055317110==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:22:49 2009 Content-Type: multipart/mixed; boundary="===============2334874656953743251==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17762 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld. Date: Fri, 25 Sep 2009 12:22:49 -0400 Message-ID: <200909251622.n8PGMnwj018309@svn01.web.mwc.hst.phx2.redhat.com> --===============2334874656953743251== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2009-09-25 12:22:49 -0400 (Fri, 25 Sep 2009) New Revision: 17762 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tl= d/TLDUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-4950 Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/we= b/tld/TLDUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/TLDUtil.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/t= ld/TLDUtil.java 2009-09-25 16:22:49 UTC (rev 17762) @@ -0,0 +1,51 @@ +/*************************************************************************= ****** + * 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 org.jboss.tools.common.model.*; + +public class TLDUtil { + static String FILE_ENTITIES =3D ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.= FileTLD_2_1."; //$NON-NLS-1$ + static String TAG_ENTITIES =3D ".TLDTag.TLDTag12.TLDTag21."; //$NON-NL= S-1$ + static String ATTR_ENTITIES =3D ".TLDAttribute.TLDAttribute12."; //$NO= N-NLS-1$ + + public static boolean isTaglib(XModelObject o) { + return isOfEntity(o, FILE_ENTITIES); + } + + public static boolean isTag(XModelObject o) { + return isOfEntity(o, TAG_ENTITIES); + } + + public static boolean isAttribute(XModelObject o) { + return isOfEntity(o, ATTR_ENTITIES); + } + + private static boolean isOfEntity(XModelObject o, String entities) { + return entities.indexOf("." + o.getModelEntity().getName() + ".") = >=3D 0; //$NON-NLS-1$//$NON-NLS-2$ + } + + public static String getTagDescription(XModelObject o) { + String attr =3D (o.getModelEntity().getAttribute("info") !=3D null= ) ? "info" : "description"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String s =3D o.getAttributeValue(attr); + s =3D (s =3D=3D null) ? "" : s.trim(); //$NON-NLS-1$ + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 0; i < s.length(); i++) { + char c =3D s.charAt(i); + if(c =3D=3D '<') sb.append("<"); //$NON-NLS-1$ + else if(c =3D=3D '>') sb.append(">"); //$NON-NLS-1$ + else sb.append(c); + } + return sb.toString(); + } + = +} + --===============2334874656953743251==-- From jbosstools-commits at lists.jboss.org Fri Sep 25 12:38:02 2009 Content-Type: multipart/mixed; boundary="===============8610720339731683559==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r17763 - in trunk/hibernatetools/docs/reference/en: modules and 1 other directory. Date: Fri, 25 Sep 2009 12:38:02 -0400 Message-ID: <200909251638.n8PGc2Tw020832@svn01.web.mwc.hst.phx2.redhat.com> --===============8610720339731683559== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: chukhutsina Date: 2009-09-25 12:38:02 -0400 (Fri, 25 Sep 2009) New Revision: 17763 Added: trunk/hibernatetools/docs/reference/en/images/plugins/autoLayout.png trunk/hibernatetools/docs/reference/en/images/plugins/expandState.png trunk/hibernatetools/docs/reference/en/images/plugins/layout.png trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram1.png trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram2.png trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram3.png trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_f.png trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_g.png trunk/hibernatetools/docs/reference/en/images/plugins/toggleConnections.= png trunk/hibernatetools/docs/reference/en/images/plugins/visibleState.png Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_c.png trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_e.png trunk/hibernatetools/docs/reference/en/modules/plugins.xml Log:

https://jira.jboss.org/jira/browse/JBDS-863 -Updated the information abo= ut Mapping Diagram in the section 4.9.1.1 of Doc-Hibernate.

Added: trunk/hibernatetools/docs/reference/en/images/plugins/autoLayout.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= autoLayout.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/expandState.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= expandState.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/layout.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= layout.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram1.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= map_diagram1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram2.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= map_diagram2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/map_diagram3.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= map_diagram3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_= c.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_= e.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_f.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= plugins_18_f.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_18_g.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= plugins_18_g.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/toggleConnecti= ons.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= toggleConnections.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/visibleState.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/= visibleState.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-09-25 1= 6:22:49 UTC (rev 17762) +++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-09-25 1= 6:38:02 UTC (rev 17763) @@ -1787,7 +1787,7 @@ In order to get a visual feel on how entities are related as= well as view their structures, a Mapping Diagram is provided. = It is available by right clicking on the entity you want a mapping diagram for and then c= hoosing - Open Mapping Diagram. + Mapping Diagram. =

Mapping Diagram @@ -1801,8 +1801,47 @@ - - For better navigating on the Diagram use Outline v= iew which is + To make Mapping Diagram usage easier y= ou can use Rules, + Grid,Snap to Geometry = checkboxes in the + View menu. +

+ View menu + = + + + + + + + If you will select + Rules checkbox, the view print p= age scale will be added to the page. + The numbers on the scale show its size in inches.If you click on= the scale a + Ruler Guide will appear on the= diagram. + You can connect any diagram item to it.To connect the items you = should move their tops + to the Ruler Guide. And while moving the ruler guide, the items = will be moved together with it as a whole. +

+ Moving the Ruler guide + = + + + + + + + If you'll select + Grid checkbox, the grid will app= ear on the diagram. +

+ Grid on Mapping diagram + = + + + + + + + The checkbox + Snap to Geometry helps to put th= e items of the diagram into allineation with the grid. + For better navigating through the diagram use Outl= ine view which is available in the structural and graphical modes.

Navigating in the Structural Mode @@ -1854,7 +1893,7 @@ = - Finally, if you need to have your Diagram exported as .png + If you need to have your Diagram exported as .png , .jpeg @@ -1872,13 +1911,54 @@ - - As you can see on the figure above, Undo= , + Using + Toggle connections option( + + ) you can hide all the connectio= ns on the diagram except the ones, + that connect POJO class to DB table. +

+ Toggle connections option usage + = + + + + + + + + Auto layout ( + + ) is used to dispose all the ite= ms of the diagram in a standard manner. + As you can see on the figure above, Coll= apse All, - Redo + Expand All and - Auto layout + Select All options are also available through the context menu.= + When you open the context menu while clicking an item on the= diagram, it quite differs from the one described before. +

+ Context menu in mapping item + = + + + + + + + Now you can see two extra options in the menu: + Toggle visible state, + Toggle expand state. + + + Toggle visible state ( + + ) is used to hide/show an ite= m on the mapping diagram. + + Toggle expand state ( + + ) is used for expanding/colla= psing fields of the item. + + All the described types of the context menu are also availab= le in the Outline view.

+Input User Name Page +

+Input User Name Page +

+Input User Name Page +

+Input User Name Page +

+Hello! +

+Input User Name Page +

+Hello! +

+Input User Name Page +

+Input User Name Page +

+Input User Name Page +

+Input User Name Page +

+Input User Name Page +

JBoss AS Tools 3.1.0.M3 - New and Noteworthy

Server

What's New Core/General

Project Archives

Properties editor

Hibernate tools 3.3.0.M3 What's New

Dali Integration

Wizards

Views

JST/JSF 3.1.0.M3 What's New

OpenOn

Code assist

Maven Tools

Maven Integration

What's New Visual Page Editor

CSS Editing

Facelets

Smooks tools 1.1.0.M3 What's New

Smooks Configuration Editor

EDI Message Mapping Graphical Editor

H1

About This Content

License

About This Content

License

About This Content

License

Test for JBIDE-4954

+ +Test for JBIDE-4954 + +