September 2008 - jbosstools-commits

JBoss Tools SVN: r10072 - trunk/common/plugins.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-09-04 18:52:54 -0400 (Thu, 04 Sep 2008) New Revision: 10072 Removed: trunk/common/plugins/org.jboss.tools.common.el.core/ Log:

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10071 - trunk/common/plugins.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-09-04 18:46:48 -0400 (Thu, 04 Sep 2008) New Revision: 10071 Added: trunk/common/plugins/org.jboss.tools.common.el.core/ trunk/common/plugins/org.jboss.tools.common.el.ui/ trunk/common/plugins/org.jboss.tools.common.resref.core/ trunk/common/plugins/org.jboss.tools.common.resref.ui/ Log: Share project "org.jboss.tools.common.resref.core" into "https://svn.jboss.org/repos/jbosstools" Share project "org.jboss.tools.common.el.ui" into "https://svn.jboss.org/repos/jbosstools" Share project "org.jboss.tools.common.el.core" into "https://svn.jboss.org/repos/jbosstools" Share project "org.jboss.tools.common.resref.ui" into "https://svn.jboss.org/repos/jbosstools"

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10070 - common and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-09-04 18:43:34 -0400 (Thu, 04 Sep 2008) New Revision: 10070 Added: common/ common/plugins/ common/plugins/org.jboss.tools.common.el.core/ Log: Share project "org.jboss.tools.common.el.core" after splitting up in core an ui parts

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10069 - in trunk/portlet/plugins/org.jboss.tools.portlet.ui: src/org/jboss/tools/portlet/ui/internal/wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2008-09-04 17:53:34 -0400 (Thu, 04 Sep 2008) New Revision: 10069 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java Log: JBIDE-2622 There is 3 portlet wizards for something that does *almost* the same thing Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-09-04 21:53:34 UTC (rev 10069) @@ -35,13 +35,14 @@ </wizard> <wizard id="org.jboss.tools.portlet.ui.wizard.NewJSFPortletWizard" - name="JBoss JSF Portlet" + name="JBoss JSF/Seam Portlet" class="org.jboss.tools.portlet.ui.internal.wizard.NewJSFPortletWizard" category="org.jboss.tools.jst.web/org.jboss.tools.portlet" icon="icons/portlet_wiz.gif"> <description>Create a new JBoss JSF Portlet</description> <selection class="org.eclipse.core.resources.IResource" /> </wizard> +  </extension> </plugin> Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2008-09-04 21:53:34 UTC (rev 10069) @@ -5,7 +5,6 @@ import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS; import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.BROWSE_BUTTON_LABEL; import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CLASS_NAME_LABEL; - import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; @@ -28,6 +27,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -170,12 +170,44 @@ data.widthHint = 300; data.horizontalSpan = 1; projectNameCombo.setLayoutData(data); + projectNameCombo.addSelectionListener(new SelectionListener() { + + public void widgetDefaultSelected(SelectionEvent e) { + updateProject(); + } + + public void widgetSelected(SelectionEvent e) { + updateProject(); + } + + }); synchHelper.synchCombo(projectNameCombo, IArtifactEditOperationDataModelProperties.PROJECT_NAME, null); initializeProjectList(); + updateProject(); new Label(parent, SWT.NONE); } + protected void updateProject() { + String projectName = projectNameCombo.getText(); + IProject project = ProjectUtilities.getProject(projectName); + try { + boolean isSeamPortlet = FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.SEAMPORTLET_FACET_ID); + boolean isJSFPortlet; + if (isSeamPortlet) { + isJSFPortlet = false; + } else { + isJSFPortlet = FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.JSFPORTLET_FACET_ID); + } + NewJSFPortletWizard wizard = (NewJSFPortletWizard) getWizard(); + NewPortletClassDataModelProvider provider = (NewPortletClassDataModelProvider) wizard.getDefaultProvider(); + provider.setSeamPortlet(isSeamPortlet); + provider.setJSFPortlet(isJSFPortlet); + } catch (CoreException e) { + // ignore + } + } + /** * */ Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java 2008-09-04 21:53:34 UTC (rev 10069) @@ -24,6 +24,8 @@ */ public class NewJSFPortletWizard extends NewWebArtifactWizard { + private NewPortletClassDataModelProvider provider; + //protected static final String PAGE_FOUR = "pageFour"; public NewJSFPortletWizard() { @@ -78,8 +80,11 @@ } @Override - protected IDataModelProvider getDefaultProvider() { - return new NewPortletClassDataModelProvider(true,false); + public IDataModelProvider getDefaultProvider() { + if (provider == null) { + provider = new NewPortletClassDataModelProvider(true,false); + } + return provider; } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2008-09-04 21:53:34 UTC (rev 10069) @@ -480,4 +480,12 @@ // Valid source is selected return WTPCommonPlugin.OK_STATUS; } + + public void setJSFPortlet(boolean isJSFPortlet) { + this.isJSFPortlet = isJSFPortlet; + } + + public void setSeamPortlet(boolean isSeamPortlet) { + this.isSeamPortlet = isSeamPortlet; + } }

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10068 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2008-09-04 14:31:40 -0400 (Thu, 04 Sep 2008) New Revision: 10068 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-2420 Exception appears on "<ctrl>+z" combination in jsp page. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-09-04 18:17:00 UTC (rev 10067) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-09-04 18:31:40 UTC (rev 10068) @@ -147,7 +147,10 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { Map<VpeTemplate, ModifyInfo> visualNodeMap = new HashMap<VpeTemplate, ModifyInfo> (); - VpeCreatorInfo creatorInfo = createVisualElement(pageContext, (Element)sourceNode, visualDocument, null, visualNodeMap); + VpeCreatorInfo creatorInfo = null; + if (sourceNode instanceof Element) { + creatorInfo = createVisualElement(pageContext, (Element)sourceNode, visualDocument, null, visualNodeMap); + } nsIDOMElement newVisualElement = null; if (creatorInfo != null) { newVisualElement = (nsIDOMElement)creatorInfo.getVisualNode(); @@ -166,8 +169,9 @@ } @Override public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData creationdata) { - validateVisualElement(pageContext, (Element)sourceNode, visualDocument, null, creationdata.getNode()==null?null: - (nsIDOMElement)(creationdata.getNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)), (Map<VpeTemplate,ModifyInfo>)creationdata.getData()); + if (sourceNode instanceof Element) + validateVisualElement(pageContext, (Element)sourceNode, visualDocument, null, creationdata.getNode()==null?null: + (nsIDOMElement)(creationdata.getNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)), (Map<VpeTemplate,ModifyInfo>)creationdata.getData()); } @Override public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name, String value) { @@ -179,7 +183,8 @@ } @Override public void beforeRemove(VpePageContext pageContext, Node sourceNode, nsIDOMNode visualNode, Object data) { - removeElement(pageContext, (Element)sourceNode, (Map<VpeTemplate,?>) data); + if (sourceNode instanceof Element) + removeElement(pageContext, (Element)sourceNode, (Map<VpeTemplate,?>) data); } @Override public boolean isChildren() {

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10067 - in trunk/vpe/plugins/org.jboss.tools.vpe.resref: META-INF and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-09-04 14:17:00 -0400 (Thu, 04 Sep 2008) New Revision: 10067 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/.project trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-2594 resref plugin moved to vpe component Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/.project =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/.project 2008-09-04 17:51:34 UTC (rev 10066) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/.project 2008-09-04 18:17:00 UTC (rev 10067) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.common.resref</name> + <name>org.jboss.tools.vpe.resref</name> <comment></comment> <projects> </projects> Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2008-09-04 17:51:34 UTC (rev 10066) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2008-09-04 18:17:00 UTC (rev 10067) @@ -2,7 +2,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Name: Resources to references Plug-in -Bundle-SymbolicName: org.jboss.tools.common.resref;singleton:=true +Bundle-SymbolicName: org.jboss.tools.vpe.resref;singleton:=true Bundle-Version: 2.0.0 Bundle-ManifestVersion: 2 Bundle-Activator: org.jboss.tools.common.resref.Activator

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10066 - trunk/vpe/plugins.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-09-04 13:51:34 -0400 (Thu, 04 Sep 2008) New Revision: 10066 Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/ Removed: trunk/vpe/plugins/org.jboss.tools.common.resref/ Log: Copied: trunk/vpe/plugins/org.jboss.tools.vpe.resref (from rev 10065, trunk/vpe/plugins/org.jboss.tools.common.resref)

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10065 - in trunk: vpe/plugins and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-09-04 13:51:09 -0400 (Thu, 04 Sep 2008) New Revision: 10065 Added: trunk/vpe/plugins/org.jboss.tools.common.resref/ Removed: trunk/common/plugins/org.jboss.tools.common.resref/ Log: https://jira.jboss.org/jira/browse/JBIDE-2594 resref plugin moved to vpe component Copied: trunk/vpe/plugins/org.jboss.tools.common.resref (from rev 10064, trunk/common/plugins/org.jboss.tools.common.resref)

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10064 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-09-04 13:49:42 -0400 (Thu, 04 Sep 2008) New Revision: 10064 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java Log: Fixed https://jira.jboss.org/jira/browse/JBIDE-2443 Modified: 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/DropUtils.java 2008-09-04 16:16:57 UTC (rev 10063) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java 2008-09-04 17:49:42 UTC (rev 10064) @@ -11,6 +11,8 @@ package org.jboss.tools.common.model.ui.editors.dnd; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -156,21 +158,32 @@ * @return */ public static IFile getResourceForMimeData(DropData dropData) { - URL newUrl = null; - try { - newUrl = new URL(dropData.getMimeData()); - } catch (MalformedURLException e) { -// VpePlugin.reportProblem(e); - ModelUIPlugin.getPluginLog().logError(e); - } - IFile file = EclipseResourceUtil.getFile(newUrl == null ? dropData.getMimeData() : newUrl.getPath()); - if(file != null && file.exists()) return file; - file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation( - new Path(newUrl.getPath()) - ); - return file; - } + // estherbin why in code below create url instance -? + // URL newUrl = null; + // URI newUri = null; + // try { + // newUri = new URI(dropData.getMimeData()); + // // newUrl = new URL(dropData.getMimeData()); + // } catch (URISyntaxException e) { + // ModelUIPlugin.getPluginLog().logError(e); + // } + IFile file = EclipseResourceUtil.getFile(dropData.getMimeData()); + + if (file == null || !file.exists()) { + URL newUrl = null; + try { + newUrl = new URL(dropData.getMimeData()); + file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(newUrl.getPath())); + // newUrl = new URL(dropData.getMimeData()); + } catch (MalformedURLException e) { + ModelUIPlugin.getPluginLog().logError(e); + } + file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(newUrl.getPath())); + } + return file; + } + /** * Find WEB-ROOT container for given project * @param project

17 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r10063 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-09-04 12:16:57 -0400 (Thu, 04 Sep 2008) New Revision: 10063 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java Log: fix bugs.JBIDE-2667(2668) Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-09-04 06:37:46 UTC (rev 10062) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-09-04 16:16:57 UTC (rev 10063) @@ -36,6 +36,12 @@ /** The Constant INSTANCE. */ private static final IELService INSTANCE = new ElService(); + public static final String DOLLAR_PREFIX = "${"; //$NON-NLS-1$ + + private static final String SUFFIX = "}"; //$NON-NLS-1$ + + public static final String SHARP_PREFIX = "#{"; //$NON-NLS-1$ + /** * Checks if is available. * @@ -108,12 +114,17 @@ * * @return the string */ - private String replace(String resourceString, ResourceReference[] references) { + private String replace(String resourceString, ResourceReference[] references) { String result = resourceString; for (ResourceReference rf : references) { - if (resourceString.contains(rf.getLocation())) { - result = result.replace(rf.getLocation(),rf.getProperties()); + final String dollarEl = String.valueOf(DOLLAR_PREFIX)+rf.getLocation()+String.valueOf(SUFFIX); + final String sharpEl = String.valueOf(SHARP_PREFIX)+rf.getLocation()+String.valueOf(SUFFIX); + + if (resourceString.contains(dollarEl)) { + result = result.replace(dollarEl, rf.getProperties()); + }else if(resourceString.contains(sharpEl)){ + result = result.replace(sharpEl, rf.getProperties()); } } return result;

17 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2008