JBoss Tools SVN: r18018 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-10-09 13:30:22 -0400 (Fri, 09 Oct 2009)
New Revision: 18018
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5010
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-10-09 17:22:13 UTC (rev 18017)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-10-09 17:30:22 UTC (rev 18018)
@@ -272,6 +272,20 @@
id="jst.seam21.preset">
</preset>
</template>
+
+ <template
+ id="template.jst.seam22">
+ <label>
+ Seam 2.2 Web Project
+ </label>
+ <fixed
+ facet="jst.java"/>
+ <fixed
+ facet="jst.web"/>
+ <preset
+ id="jst.seam22.preset">
+ </preset>
+ </template>
</extension>
<extension
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2009-10-09 17:22:13 UTC (rev 18017)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2009-10-09 17:30:22 UTC (rev 18018)
@@ -132,12 +132,14 @@
private static final String templateJstSeam1 = "template.jst.seam"; //$NON-NLS-1$
private static final String templateJstSeam2 = "template.jst.seam2"; //$NON-NLS-1$
private static final String templateJstSeam21 = "template.jst.seam21"; //$NON-NLS-1$
+ private static final String templateJstSeam22 = "template.jst.seam22"; //$NON-NLS-1$
private static final Map<String, String> templates = new HashMap<String, String>();
static {
templates.put("jst.seam.preset", templateJstSeam1); //$NON-NLS-1$
templates.put("jst.seam2.preset", templateJstSeam2); //$NON-NLS-1$
templates.put("jst.seam21.preset", templateJstSeam21); //$NON-NLS-1$
+ templates.put("jst.seam22.preset", templateJstSeam22); //$NON-NLS-1$
}
private void setSeamConfigTemplate(String seamConfigTemplate) {
@@ -244,11 +246,13 @@
seamConfigTemplate = templateJstSeam1;
} else if(runtime.getVersion()==SeamVersion.SEAM_2_0) {
seamConfigTemplate = templateJstSeam2;
+ } else if(runtime.getVersion()==SeamVersion.SEAM_2_1) {
+ seamConfigTemplate = templateJstSeam21;
} else {
- seamConfigTemplate = templateJstSeam21;
+ seamConfigTemplate = templateJstSeam22;
}
} else {
- seamConfigTemplate = templateJstSeam21;
+ seamConfigTemplate = templateJstSeam22;
}
}
return ProjectFacetsManager.getTemplate(seamConfigTemplate);
15 years
JBoss Tools SVN: r18017 - in trunk/jbpm/features: org.jboss.tools.jbpm4.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-10-09 13:22:13 -0400 (Fri, 09 Oct 2009)
New Revision: 18017
Added:
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/license.html
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/license.html
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml
Log:
jbpm3/4: fix features, licenses, build.properties
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/build.properties 2009-10-09 16:58:18 UTC (rev 18016)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/build.properties 2009-10-09 17:22:13 UTC (rev 18017)
@@ -1,4 +1,5 @@
-bin.includes = feature.xml
+bin.includes = feature.*,\
+ license.html
generate.feature(a)org.jboss.tools.jbpm.common.source.feature=org.jboss.tools.jbpm.common.feature
generate.feature(a)org.jbpm.gd.jpdl.source.feature=org.jbpm.gd.jpdl.feature
\ No newline at end of file
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties 2009-10-09 16:58:18 UTC (rev 18016)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties 2009-10-09 17:22:13 UTC (rev 18017)
@@ -2,7 +2,8 @@
featureProvider=JBoss by Red Hat
description=This feature includes all end-user tools for jBPM 3, including runtime and sources.
copyright=Copyright 2009 Red Hat, Inc.
-licenseURL=http://www.eclipse.org/legal/epl-v10.html
+licenseURL=license.html
+updateSiteName=JBossTools Update Site
license=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
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml 2009-10-09 16:58:18 UTC (rev 18016)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml 2009-10-09 17:22:13 UTC (rev 18017)
@@ -17,6 +17,10 @@
%license
</license>
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ </url>
+
<includes
id="org.jboss.tools.jbpm.common.feature"
version="0.0.0"/>
Added: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/license.html
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/license.html (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/license.html 2009-10-09 17:22:13 UTC (rev 18017)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>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.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/license.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties 2009-10-09 16:58:18 UTC (rev 18016)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties 2009-10-09 17:22:13 UTC (rev 18017)
@@ -1,2 +1,2 @@
-bin.includes = feature.xml,\
- feature.properties
+bin.includes = feature.*,\
+ license.html
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml 2009-10-09 16:58:18 UTC (rev 18016)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml 2009-10-09 17:22:13 UTC (rev 18017)
@@ -3,7 +3,7 @@
id="org.jboss.tools.jbpm4.feature"
label="%featureName"
version="4.0.0.qualifier"
- provider-name="%providerName">
+ provider-name="%featureProvider">
<description>
%description
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-10-09 16:58:18 UTC (rev 18016)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/build.properties 2009-10-09 17:22:13 UTC (rev 18017)
@@ -1,5 +1,5 @@
-bin.includes = feature.xml,\
- feature.properties
+bin.includes = feature.*,\
+ license.html
generate.feature(a)org.jboss.tools.flow.jpdl4.source.feature=org.jboss.tools.flow.jpdl4.feature
generate.feature(a)org.jboss.tools.flow.common.source.feature=org.jboss.tools.flow.common.feature
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-10-09 16:58:18 UTC (rev 18016)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-10-09 17:22:13 UTC (rev 18017)
@@ -17,6 +17,10 @@
%license
</license>
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ </url>
+
<includes
id="org.jboss.tools.jbpm.common.feature"
version="0.0.0"/>
Added: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/license.html
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/license.html (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/license.html 2009-10-09 17:22:13 UTC (rev 18017)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>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.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/license.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years
JBoss Tools SVN: r18016 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-09 12:58:18 -0400 (Fri, 09 Oct 2009)
New Revision: 18016
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-4970
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2009-10-09 16:44:24 UTC (rev 18015)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2009-10-09 16:58:18 UTC (rev 18016)
@@ -37,7 +37,7 @@
ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
ObjectEditorClass="%XML%" XMLSUBPATH="html" name="FileJSF2Component">
<XChildrenEntities>
- <XChildEntity name="JSF2ComponentInterface"/>
+ <XChildEntity maxCount="1" name="JSF2ComponentInterface" required="yes"/>
<XChildEntity name="JSF2ComponentImplementation"/>
</XChildrenEntities>
<XEntityRenderer>
@@ -123,38 +123,10 @@
</XActionItem>
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Create%"
+ <XActionItem HandlerClassName="%Redirect%"
ICON="action.new.struts.webapp.res_ref"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Component..." kind="action" name="AddComponent">
- <EntityData EntityName="SeamComponent20">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="class" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Create%"
- ICON="action.new.struts.webapp.res_ref"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Factory..." kind="action" name="AddFactory">
- <EntityData EntityName="SeamFactory20">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="value" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Event..." kind="action" name="AddEvent">
- <EntityData EntityName="SeamEvent20">
- <AttributeData AttributeName="type"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Import..." kind="action" name="AddImport">
- <EntityData EntityName="SeamImport">
- <AttributeData AttributeName="import"/>
- </EntityData>
- </XActionItem>
+ PROPERTIES="validator.add=true;sourcepath=Interface;actionpath=CreateActions/AddAttribute"
+ displayName="Attribute..." kind="action" name="AddAttribute"/>
</XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
@@ -333,7 +305,16 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%"
+ ICON="action.new.struts.webapp.res_ref"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Attribute..." kind="action" name="AddAttribute">
+ <EntityData EntityName="JSF2ComponentAttribute">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
15 years
JBoss Tools SVN: r18015 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/jsf2/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-09 12:44:24 -0400 (Fri, 09 Oct 2009)
New Revision: 18015
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/CompositeComponentNamespaces.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentRecognizer.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4970
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2009-10-09 15:32:00 UTC (rev 18014)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2009-10-09 16:44:24 UTC (rev 18015)
@@ -71,7 +71,8 @@
default="http://www.w3.org/1999/xhtml" name="xmlns" xmlname="xmlns"/>
<XModelAttribute name="xmlns:xsi" xmlname="xmlns:xsi"/>
<XModelAttribute name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/>
- <XModelAttribute name="namespaceMapping"/>
+ <XModelAttribute
+ default="composite composite http://java.sun.com/jsf/composite" name="namespaceMapping"/>
<XModelAttribute name="encoding">
<Constraint loader="ListString">
<value name="ISO-8859-1"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/CompositeComponentNamespaces.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/CompositeComponentNamespaces.java 2009-10-09 15:32:00 UTC (rev 18014)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/CompositeComponentNamespaces.java 2009-10-09 16:44:24 UTC (rev 18015)
@@ -80,26 +80,22 @@
// StringBuffer loc = new StringBuffer();
// loc.append(object.getAttributeValue("xsi:schemaLocation")); //$NON-NLS-1$
XModelObject[] cs = object.getChildren();
+
Set<String> ns = new HashSet<String>();
+
for (int i = 0; i < cs.length; i++) {
String n = cs[i].getModelEntity().getXMLSubPath();
int k = n.indexOf(':');
if(k < 0) continue;
String defaultNamespace = n.substring(0, k);
- if(ns.contains(defaultNamespace)) continue;
- ns.add(defaultNamespace);
- String uri = namespaceMapping.getURIForDefaultNamespace(defaultNamespace);
- if(uri == null) continue;
- String actualNamespace = namespaceMapping.getActualNamespace(defaultNamespace);
- if(actualNamespace == null) actualNamespace = defaultNamespace;
- element.setAttribute(XMLNS_PREFIX + actualNamespace, uri);
+ validateNamespace(element, namespaceMapping, defaultNamespace, ns);
// String schema = getSchema(defaultNamespace);
// if(loc.indexOf(uri) < 0) {
// loc.append(' ').append(uri).append(' ').append(schema);
// }
}
-
+
XModelObject im = object.getChildByPath("Implementation");
if(im != null) {
XModelObject[] cs2 = im.getChildren();
@@ -108,15 +104,23 @@
int k = n.indexOf(':');
if(k < 0) continue;
String defaultNamespace = n.substring(0, k);
- if(ns.contains(defaultNamespace)) continue;
- ns.add(defaultNamespace);
- String uri = namespaceMapping.getURIForDefaultNamespace(defaultNamespace);
- if(uri == null) continue;
- String actualNamespace = namespaceMapping.getActualNamespace(defaultNamespace);
- if(actualNamespace == null) actualNamespace = defaultNamespace;
- element.setAttribute(XMLNS_PREFIX + actualNamespace, uri);
+ validateNamespace(element, namespaceMapping, defaultNamespace, ns);
}
}
+
+ if(!ns.contains("composite")) {
+ validateNamespace(element, namespaceMapping, "composite", ns);
+ }
// object.setAttributeValue("xsi:schemaLocation", loc.toString()); //$NON-NLS-1$
}
+
+ static void validateNamespace(Element element, NamespaceMapping namespaceMapping, String defaultNamespace, Set<String> ns) {
+ if(ns.contains(defaultNamespace)) return;
+ ns.add(defaultNamespace);
+ String uri = namespaceMapping.getURIForDefaultNamespace(defaultNamespace);
+ if(uri == null) return;
+ String actualNamespace = namespaceMapping.getActualNamespace(defaultNamespace);
+ if(actualNamespace == null) actualNamespace = defaultNamespace;
+ element.setAttribute(XMLNS_PREFIX + actualNamespace, uri);
+ }
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentRecognizer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentRecognizer.java 2009-10-09 15:32:00 UTC (rev 18014)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentRecognizer.java 2009-10-09 16:44:24 UTC (rev 18015)
@@ -20,7 +20,7 @@
int j = body.indexOf(">", i); //$NON-NLS-1$
if(j < 0) return false;
String s = body.substring(i, j);
- return s.indexOf(COMPOSITE_XMLNS) > 0;
+ return s.indexOf("\"" + COMPOSITE_XMLNS + "\"") > 0; //$NON-NLS-1$ //$NON-NLS-2$
}
}
15 years
JBoss Tools SVN: r18014 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-09 11:32:00 -0400 (Fri, 09 Oct 2009)
New Revision: 18014
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5003
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2009-10-09 15:31:44 UTC (rev 18013)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2009-10-09 15:32:00 UTC (rev 18014)
@@ -129,6 +129,7 @@
public String ENT_ESB_CRON_SCHEDULE = "ESBCronSchedule101"; //$NON-NLS-1$
public String ENT_ESB_ROUTE_TO = "ESBPreRouteTo"; //$NON-NLS-1$
+ public String ENT_ESB_OBJECT_PATH = "ESBPreObjectPath"; //$NON-NLS-1$
public String ATTR_NAME = "name"; //$NON-NLS-1$
public String ATTR_VALUE = "value"; //$NON-NLS-1$
15 years
JBoss Tools SVN: r18013 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-10-09 11:31:44 -0400 (Fri, 09 Oct 2009)
New Revision: 18013
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4975, Setting up the correct preference page size.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-10-09 15:30:34 UTC (rev 18012)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-10-09 15:31:44 UTC (rev 18013)
@@ -11,13 +11,13 @@
package org.jboss.tools.vpe.editor.preferences;
import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.swt.SWT;
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;
public class VpeEditorPreferencesPage extends TabbedPreferencesPage implements IWorkbenchPreferencePage {
-
public static final String ID = "org.jboss.tools.vpe.editor"; //$NON-NLS-1$
public VpeEditorPreferencesPage() {
@@ -29,10 +29,16 @@
PreferenceDialog prefsdlg = PreferencesUtil.createPreferenceDialogOn(
PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- ID, new String[] {
- ID }, null);
-
+ ID, new String[] { ID }, null);
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-4975
+ * Setting up the correct preference page size.
+ * Without specifying any preferred size
+ * the default constrained Shell bounds are used,
+ * which are not always optimal.
+ */
+ prefsdlg.getShell().setSize(prefsdlg.getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT));
prefsdlg.open();
}
-
+
}
\ No newline at end of file
15 years
JBoss Tools SVN: r18012 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-09 11:30:34 -0400 (Fri, 09 Oct 2009)
New Revision: 18012
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5003
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-10-09 15:13:19 UTC (rev 18011)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2009-10-09 15:30:34 UTC (rev 18012)
@@ -149,4 +149,12 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddRouteTo") //$NON-NLS-1$
);
+ static IFormData ESB_OBJECT_PATH_LIST_DEFINITION = new FormData(
+ "Object Paths List", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("esb", 100)},
+ new String[]{ENT_ESB_OBJECT_PATH},
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddObjectPath") //$NON-NLS-1$
+ );
+
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-10-09 15:13:19 UTC (rev 18011)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2009-10-09 15:30:34 UTC (rev 18012)
@@ -71,6 +71,8 @@
if(entityName.startsWith(PREACTION_PREFIX)) {
if(entity.getChild(ENT_ESB_ROUTE_TO) != null) {
list.add(ESBListsFormLayoutData.ESB_ROUTE_LIST_DEFINITION);
+ } else if(entity.getChild(ENT_ESB_OBJECT_PATH) != null) {
+ list.add(ESBListsFormLayoutData.ESB_OBJECT_PATH_LIST_DEFINITION);
}
//do nothing; when specific children exist use specific forms
} else if(entity.getChild(ENT_ESB_PROPERTY) != null) {
15 years
JBoss Tools SVN: r18011 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-09 11:13:19 -0400 (Fri, 09 Oct 2009)
New Revision: 18011
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5003
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-10-09 14:50:27 UTC (rev 18010)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-10-09 15:13:19 UTC (rev 18011)
@@ -127,3 +127,4 @@
ESB.fault_xsd=Fault XSD
ESB.validate=Validate
ESB.webservice=Webservice
+ESB.esb=esb
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-10-09 14:50:27 UTC (rev 18010)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-10-09 15:13:19 UTC (rev 18011)
@@ -427,20 +427,17 @@
ESBActivationConfig101_Properties.Title=ESB Activation Config
+ESB.AddRouteTo.WindowTitle=Add Route To
+ESB.AddRouteTo..Title=ESB Route To
+
# Actions extension
-ESBPreActionContentBasedRouter101_AddRouteTo.WindowTitle=Add Route To
-ESBPreActionContentBasedRouter101_AddRouteTo.Title=ESB Route To
+ESBPreActionBusinessRulesProcessor101_AddObjectPath.WindowTitle=Add Object Path
+ESBPreActionBusinessRulesProcessor101_AddObjectPath.Title=ESB Object Path
ESBPreActionNotifier101_AddNotificationList.WindowTitle=Add Notification List
ESBPreActionNotifier101_AddNotificationList.Title=ESB Notification List
-ESBPreActionStaticRouter101_AddRouteTo.WindowTitle=Add Route To
-ESBPreActionStaticRouter101_AddRouteTo.Title=ESB Route To
-
-ESBPreActionStaticWiretap101_AddRouteTo.WindowTitle=Add Route To
-ESBPreActionStaticWiretap101_AddRouteTo.Title=ESB Route To
-
ESBPreActionXStreamToObject101_AddAlias.WindowTitle=Add Alias
ESBPreActionXStreamToObject101_AddAlias.Title=ESB Alias
@@ -453,6 +450,8 @@
ESBPreRouteTo_Properties.Title=ESB Route To
+ESBPreObjectPath_Properties.Title=ESB Object Path
+
ESBPreTarget_CreateTag.WindowTitle=Add Tag
ESBPreTarget_CreateTag.Title=XML Element
@@ -601,3 +600,4 @@
ESBPreActionStaticWiretap101_Properties.Title=Static Wiretap
ESBPreActionSystemPrintln101_Properties.Title=System Println
ESBPreActionXStreamToObject101_Properties.Title=XStream to Object
+ESBPreActionBusinessRulesProcessor101_Properties.Title=Business Rules Processor
\ No newline at end of file
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-10-09 14:50:27 UTC (rev 18010)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-10-09 15:13:19 UTC (rev 18011)
@@ -90,6 +90,71 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionBusinessRulesProcessor101">
+ <XChildrenEntities>
+ <XChildEntity name="ESBProperty"/>
+ <XChildEntity name="ESBPreObjectPath"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="content based router action"
+ loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ default="org.jboss.soa.esb.actions.BusinessRulesProcessor"
+ name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ name="rule set" xmlname="ruleSet"/>
+ <XModelAttribute PROPERTIES="category=general;pre=true"
+ name="rule language" xmlname="ruleLanguage"/>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ default="Default(false)" name="rule reload" xmlname="ruleReload">
+ <Constraint loader="ListString">
+ <value name="Default(false)"/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
+ <Constraint loader="ListString">
+ <value name="process"/>
+ <value name="split"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Object Path..." kind="action" name="AddObjectPath">
+ <EntityData EntityName="ESBPreObjectPath">
+ <AttributeData AttributeName="esb"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="action" name="ESBPreActionByteArrayToString101">
<XChildrenEntities>
@@ -1082,6 +1147,50 @@
</XModelEntity>
<XModelEntity
ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=path"
+ XMLSUBPATH="object-path" name="ESBPreObjectPath">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="route to" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="esb" xmlname="esb"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=route"
XMLSUBPATH="route-to" name="ESBPreRouteTo">
<XChildrenEntities/>
@@ -1202,6 +1311,7 @@
<XChildEntity name="ESBPreActionSOAPClient101"/>
<XChildEntity name="ESBPreActionSystemPrintln101"/>
<XChildEntity name="ESBPreActionNotifier101"/>
+ <XChildEntity name="ESBPreActionBusinessRulesProcessor101"/>
</XChildrenEntities>
<XActionItem kind="list">
<XActionItem ICON="action.empty" displayName="New" group="1"
@@ -1378,6 +1488,15 @@
<AttributeData AttributeName="message"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Business Rules Processor..." kind="action" name="AddBusinessRulesProcessor">
+ <EntityData EntityName="ESBPreActionBusinessRulesProcessor101">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="process" Mandatory="no"/>
+ <AttributeData AttributeName="rule set"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
</XActionItem>
</XActionItem>
@@ -1403,21 +1522,20 @@
<XChildEntity name="ESBPreActionSOAPClient101"/>
<XChildEntity name="ESBPreActionSystemPrintln101"/>
<XChildEntity name="ESBPreActionNotifier101"/>
+ <XChildEntity name="ESBPreActionBusinessRulesProcessor101"/>
</XChildrenEntities>
<XActionItem kind="list">
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
<XActionItem displayName="Add Pre-Packed Action" kind="list" name="PrePackedAction">
- <XActionItemReference entity="ESBActions101" name="AddObjectInvoke" path="CreateActions/AddObjectInvoke"/>
- <XActionItemReference entity="ESBActions101" name="Converters" path="CreateActions/Converters"/>
- <XActionItemReference entity="ESBActions101"
- name="AddCommandInterpreter" path="CreateActions/AddCommandInterpreter"/>
- <XActionItemReference entity="ESBActions101"
- name="AddGroovyProcessor" path="CreateActions/AddGroovyProcessor"/>
- <XActionItemReference entity="ESBActions101" name="Routers" path="CreateActions/Routers"/>
- <XActionItemReference entity="ESBActions101" name="SOAP" path="CreateActions/SOAP"/>
- <XActionItemReference entity="ESBActions101"
- name="AddSystemPrintln" path="CreateActions/AddSystemPrintln"/>
+ <XActionItemReference entity="ESBActions101" name="AddObjectInvoke"/>
+ <XActionItemReference entity="ESBActions101" name="Converters"/>
+ <XActionItemReference entity="ESBActions101" name="AddCommandInterpreter"/>
+ <XActionItemReference entity="ESBActions101" name="AddGroovyProcessor"/>
+ <XActionItemReference entity="ESBActions101" name="Routers"/>
+ <XActionItemReference entity="ESBActions101" name="SOAP"/>
+ <XActionItemReference entity="ESBActions101" name="AddSystemPrintln"/>
+ <XActionItemReference entity="ESBActions101" name="AddBusinessRulesProcessor"/>
</XActionItem>
</XActionItem>
</XActionItem>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-10-09 14:50:27 UTC (rev 18010)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-10-09 15:13:19 UTC (rev 18011)
@@ -23,6 +23,7 @@
import org.jboss.tools.esb.core.ESBCorePlugin;
import org.jboss.tools.esb.core.model.converters.AliasConverter;
import org.jboss.tools.esb.core.model.converters.NotificationConverter;
+import org.jboss.tools.esb.core.model.converters.ObjectPathConverter;
import org.jboss.tools.esb.core.model.converters.RouteToConverter;
/**
@@ -75,6 +76,8 @@
//wsdl, operation +other
{"org.jboss.soa.esb.actions.SystemPrintln", "ESBPreActionSystemPrintln"},
//message, printfull, outputstream
+ {"org.jboss.soa.esb.actions.BusinessRulesProcessor", "ESBPreActionBusinessRulesProcessor"},
+ //ruleSet, ruleLanguage, ruleReload, object-paths!
};
public static final SpecificActionLoader instance = new SpecificActionLoader();
@@ -173,6 +176,8 @@
new AliasConverter().toSpecific(basic, action);
} else if("route".equals(converter)) {
new RouteToConverter().toSpecific(basic, action);
+ } else if("path".equals(converter)) {
+ new ObjectPathConverter().toSpecific(basic, action);
} else if("notification".equals(converter)) {
new NotificationConverter().toSpecific(basic, action);
}
@@ -230,6 +235,8 @@
new AliasConverter().toBasic(result, action);
} else if("route".equals(converter)) {
new RouteToConverter().toBasic(result, action);
+ } else if("path".equals(converter)) {
+ new ObjectPathConverter().toBasic(result, action);
} else if("notification".equals(converter)) {
new NotificationConverter().toBasic(result, action);
}
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java 2009-10-09 15:13:19 UTC (rev 18011)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * 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.esb.core.model.converters;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class ObjectPathConverter extends ListConverter {
+ static final String OBJECT_PATH_ENTITY = "ESBPreObjectPath";
+ static final String OBJECT_PATHS = "object-paths";
+
+ protected String getPropertyName() {
+ return OBJECT_PATHS;
+ }
+
+ protected String getItemEntityName() {
+ return OBJECT_PATH_ENTITY;
+ }
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years
JBoss Tools SVN: r18010 - in trunk: common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-10-09 10:50:27 -0400 (Fri, 09 Oct 2009)
New Revision: 18010
Removed:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchResult.java
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.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/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4856, 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/refactoring/RefactorSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -288,7 +288,7 @@
}
}
- private int getOffset(ELInvocationExpression expression){
+ protected int getOffset(ELInvocationExpression expression){
if(expression instanceof ELPropertyInvocation){
ELPropertyInvocation pi = (ELPropertyInvocation)expression;
@@ -361,7 +361,7 @@
protected abstract void match(IFile file, int offset, int length);
- private void checkMatch(IFile file, ELExpression operand, int offset, int length){
+ protected void checkMatch(IFile file, ELExpression operand, int offset, int length){
if(javaElement != null && operand != null)
resolve(file, operand, offset-getOffset((ELInvocationExpression)operand));
else
@@ -395,7 +395,7 @@
return false;
}
- private void resolve(IFile file, ELExpression operand, int offset) {
+ protected void resolve(IFile file, ELExpression operand, int offset) {
ELResolver[] resolvers = ELResolverFactoryManager.getInstance()
.getResolvers(file);
@@ -420,16 +420,6 @@
for(ELSegment segment : segments){
match(file, offset+segment.getSourceReference().getStartPosition(), segment.getSourceReference().getLength());
}
-
-// if (segment != null && segment instanceof JavaMemberELSegment
-// && segment.isResolved()) {
-// JavaMemberELSegment javaSegment = (JavaMemberELSegment) segment;
-// IJavaElement segmentJavaElement = javaSegment.getJavaElement();
-// if (javaElement.equals(segmentJavaElement)){
-// match(file, offset, length);
-// return;
-// }
-// }
}
}
}
\ 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
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -37,6 +37,13 @@
ELContext getContext();
/**
+ * Finds the segments which are resolved to given variable.
+ * @param element
+ * @return
+ */
+ List<ELSegment> findSegmentsByVariable(IVariable variable);
+
+ /**
* Finds the segments which are resolved to given java element.
* @param element
* @return
Modified: 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/ELResolutionImpl.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -31,7 +31,23 @@
protected Set<TextProposal> proposals = new HashSet<TextProposal>();
protected ELInvocationExpression lastResolvedToken;
protected boolean mapOrCollectionOrBundleAmoungTheTokens;
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentsByJavaElement(org.eclipse.jdt.core.IJavaElement)
+ */
+ public List<ELSegment> findSegmentsByVariable(IVariable variable) {
+ ArrayList<ELSegment> list = new ArrayList<ELSegment>();
+ for(ELSegment segment : segments){
+ for(IVariable var : segment.getVariables()){
+ if(var.getName().equals(variable.getName())){
+ list.add(segment);
+ }
+ }
+ }
+ return list;
+ }
+
/* (non-Javadoc)
* @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentsByJavaElement(org.eclipse.jdt.core.IJavaElement)
*/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -26,8 +26,6 @@
* @author Alexey Kazakov, Daniel Azarov
*/
public class RenameComponentProcessor extends SeamRenameProcessor {
- private ISeamComponent component;
-
/**
* @param component Renamed component
@@ -89,7 +87,6 @@
public Change createChange(IProgressMonitor pm) throws CoreException,
OperationCanceledException {
-
return rootChange;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameSeamContextVariableProcessor.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -41,7 +41,7 @@
*/
public class RenameSeamContextVariableProcessor extends SeamRenameProcessor {
IFile file;
- private ISeamComponent component;
+
/**
* @param file where refactor was called
*/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -10,16 +10,30 @@
******************************************************************************/
package org.jboss.tools.seam.internal.core.refactoring;
+import java.util.List;
+
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.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.el.core.refactoring.RefactorSearcher;
+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.SimpleELContext;
+import org.jboss.tools.common.el.core.resolver.Var;
+import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.SeamProjectsSet;
public abstract class SeamRefactorSearcher extends RefactorSearcher {
- SeamProjectsSet projectsSet;
+ private SeamProjectsSet projectsSet;
+ private ISeamComponent component;
public SeamRefactorSearcher(IFile file, String name){
super(file, name);
@@ -31,6 +45,11 @@
javaElement = element;
}
+ public SeamRefactorSearcher(IFile file, String name, ISeamComponent component){
+ this(file, name);
+ this.component = component;
+ }
+
protected IProject[] getProjects(){
return projectsSet.getAllProjects();
}
@@ -55,5 +74,43 @@
}
return true;
}
+
+ protected void checkMatch(IFile file, ELExpression operand, int offset, int length){
+ if(javaElement != null && operand != null)
+ resolve(file, operand, offset-getOffset((ELInvocationExpression)operand));
+ else if(component != null && operand != null)
+ resolveComponentsReferences(file, operand, offset-getOffset((ELInvocationExpression)operand));
+ else
+ match(file, offset, length);
+ }
+
+ private void resolveComponentsReferences(IFile file, ELExpression operand, int offset) {
+ ELResolver[] resolvers = ELResolverFactoryManager.getInstance()
+ .getResolvers(file);
+
+ for (ELResolver resolver : resolvers) {
+ if (!(resolver instanceof ELCompletionEngine))
+ continue;
+
+ SimpleELContext context = new SimpleELContext();
+
+ context.setResource(file);
+ context.setElResolvers(resolvers);
+
+ List<Var> vars = ElVarSearcher.findAllVars(context, offset,
+ resolver);
+
+ context.setVars(vars);
+
+ ELResolution resolution = resolver.resolve(context, operand);
+
+ List<ELSegment> segments = resolution.findSegmentsByVariable(component);
+
+ for(ELSegment segment : segments){
+ match(file, offset+segment.getSourceReference().getStartPosition(), segment.getSourceReference().getLength());
+ }
+ }
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -11,10 +11,8 @@
package org.jboss.tools.seam.internal.core.refactoring;
import java.util.ArrayList;
-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;
@@ -32,7 +30,6 @@
import org.eclipse.text.edits.TextEdit;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
-import org.jboss.tools.common.el.core.refactoring.RefactorSearcher;
import org.jboss.tools.common.model.project.ext.ITextSourceReference;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.BijectedAttributeType;
@@ -77,6 +74,8 @@
private SeamSearcher searcher = null;
+ protected ISeamComponent component;
+
protected SeamSearcher getSearcher(){
if(searcher == null){
searcher = new SeamSearcher(declarationFile, getOldName());
@@ -444,7 +443,7 @@
class SeamSearcher extends SeamRefactorSearcher{
public SeamSearcher(IFile declarationFile, String oldName){
- super(declarationFile, oldName);
+ super(declarationFile, oldName, component);
}
@Override
@@ -458,6 +457,9 @@
}
protected ELInvocationExpression findComponentReference(ELInvocationExpression invocationExpression){
+ if(component != null)
+ return invocationExpression;
+
ELInvocationExpression invExp = invocationExpression;
while(invExp != null){
if(invExp instanceof ELPropertyInvocation){
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -1,101 +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.seam.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.search.SearchMessages;
-import org.eclipse.jdt.internal.ui.search.SearchUtil;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.search.ELSearchQuery;
-
-public class FindUsagesInELAction extends Action implements IWorkbenchWindowActionDelegate, IActionDelegate2 {
- private IFile javaFile;
- private IType type;
- private IMethod method;
- private String propertyName;
-
- public FindUsagesInELAction(IFile file, IType type, IMethod method, String propertyName){
- super(SeamUIMessages.FIND_USAGES_IN_EL);
- this.javaFile = file;
- this.type = type;
- this.method = method;
- this.propertyName = propertyName;
- }
-
- public void dispose() {
- }
-
- public void init(IWorkbenchWindow window) {
- }
-
- public void run() {
- try {
- performNewSearch();
- } catch (JavaModelException jme) {
- SeamGuiPlugin.getPluginLog().logError(jme);
- } catch (InterruptedException ie) {
- SeamGuiPlugin.getPluginLog().logError(ie);
- }
- }
-
- private void performNewSearch() throws JavaModelException, InterruptedException {
- ELSearchQuery query= createQuery();
- if (query.canRunInBackground()) {
- SearchUtil.runQueryInBackground(query);
- } else {
- IProgressService progressService= PlatformUI.getWorkbench().getProgressService();
- IStatus status= SearchUtil.runQueryInForeground(progressService, query);
- if (status.matches(IStatus.ERROR | IStatus.INFO | IStatus.WARNING)) {
- ErrorDialog.openError(getShell(), SearchMessages.Search_Error_search_title, SearchMessages.Search_Error_search_message, status);
- }
- }
- }
-
- private ELSearchQuery createQuery() throws JavaModelException, InterruptedException {
- return new ELSearchQuery(javaFile, type, propertyName);
- }
-
- private Shell getShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
-
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
- public void init(IAction action) {
- }
-
- public void runWithEvent(IAction action, Event event) {
- }
-
- public void run(IAction action) {
- run();
- }
-
-
-}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -25,10 +25,8 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
import org.eclipse.jdt.ui.text.IJavaPartitions;
import org.eclipse.jface.action.Action;
@@ -80,7 +78,6 @@
import org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.actions.FindUsagesInELAction;
import org.jboss.tools.seam.ui.wizard.RenameComponentWizard;
import org.jboss.tools.seam.ui.wizard.RenameSeamContextVariableWizard;
import org.w3c.dom.Node;
@@ -213,42 +210,6 @@
}
}
- private void checkPropertyName(TextSelection selection, MenuManager mm, IContributionRoot additions){
- try{
- ICompilationUnit comUnit = getCompilationUnit(editorFile);
- if(comUnit != null){
- IJavaElement element = comUnit.getElementAt(selection.getOffset());
- if(element != null){
- //System.out.println("element - "+element.getClass());
- if(element instanceof IMethod){
- IMethod method = (IMethod) element;
- IType type = method.getDeclaringType();
- String propertyName = getPropertyName(method);
-
- mm.add(new FindUsagesInELAction(editorFile, type, method, propertyName));
- additions.addContributionItem(mm, null);
- }
- }
- }
- }catch(CoreException ex){
- SeamGuiPlugin.getPluginLog().logError(ex);
- }
- }
-
- private boolean checkNameAnnotation(TextSelection selection){
- IAnnotation nameAnnotation = getNameAnnotation(editorFile);
- if(nameAnnotation != null){
- try{
- ISourceRange range = nameAnnotation.getSourceRange();
- if(selection.getOffset() >= range.getOffset() && selection.getOffset()+selection.getLength() <= range.getOffset()+range.getLength())
- return true;
- }catch(JavaModelException ex){
- SeamCorePlugin.getPluginLog().logError(ex);
- }
- }
- return false;
- }
-
private boolean checkContextVariableInJava(IFile file, String content, TextSelection selection){
try {
FastJavaPartitionScanner scaner = new FastJavaPartitionScanner();
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -1,94 +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.seam.ui.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.search.ui.text.Match;
-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.internal.core.refactoring.SeamRefactorSearcher;
-
-public class ELSearchQuery implements ISearchQuery {
- private String propertyName;
- private ELSearcher searcher;
-
- private ELSearchResult result;
-
- public ELSearchQuery(IFile file, IType type, String propertyName){
- this.propertyName = propertyName;
- searcher = new ELSearcher(file, propertyName);
-
- result = new ELSearchResult(this);
- }
-
- public String getPropertyName(){
- return propertyName;
- }
-
- public boolean canRerun() {
- return false;
- }
-
- public boolean canRunInBackground() {
- return true;
- }
-
- public String getLabel() {
- return "Seach for property references in Expression Language";
- }
-
- public ISearchResult getSearchResult() {
- return result;
- }
-
- public IStatus run(IProgressMonitor monitor)
- throws OperationCanceledException {
- searcher.findELReferences();
-
- return Status.OK_STATUS;
- }
-
- class ELSearcher extends SeamRefactorSearcher{
- public ELSearcher(IFile file, String name){
- super(file, name);
- }
-
- @Override
- protected void match(IFile file, int offset, int length) {
- Match match = new Match(file, offset, length);
- result.addMatch(match);
- }
-
- protected ELInvocationExpression findComponentReference(ELInvocationExpression invocationExpression){
- ELInvocationExpression invExp = invocationExpression;
- while(invExp != null){
- if(invExp instanceof ELMethodInvocation || invExp instanceof ELPropertyInvocation){
- if(invExp.getMemberName() != null && invExp.getMemberName().equalsIgnoreCase(propertyName))
- return invExp;
- else
- invExp = invExp.getLeft();
- }else{
- invExp = invExp.getLeft();
- }
- }
- return null;
- }
- }
-}
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchResult.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchResult.java 2009-10-09 13:47:29 UTC (rev 18009)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchResult.java 2009-10-09 14:50:27 UTC (rev 18010)
@@ -1,90 +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.seam.ui.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.search.internal.ui.SearchPluginImages;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.IEditorMatchAdapter;
-import org.eclipse.search.ui.text.IFileMatchAdapter;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-
-public class ELSearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter, IFileMatchAdapter {
- private ELSearchQuery query;
- private final Match[] EMPTY_ARR= new Match[0];
-
- public ELSearchResult(ELSearchQuery query){
- super();
- this.query = query;
- }
-
- public ImageDescriptor getImageDescriptor() {
- return SearchPluginImages.DESC_OBJ_TSEARCH_DPDN;
- }
-
- public String getLabel() {
- return "'"+query.getPropertyName()+"' property references in Expression Language - "+getMatchCount()+" matches found";
- }
-
- public ISearchQuery getQuery() {
- return query;
- }
-
- public String getTooltip() {
- return getLabel();
- }
-
- @Override
- public IEditorMatchAdapter getEditorMatchAdapter() {
- return this;
- }
-
- @Override
- public IFileMatchAdapter getFileMatchAdapter() {
- return this;
- }
-
- public Match[] computeContainedMatches(AbstractTextSearchResult result,
- IEditorPart editor) {
- IEditorInput ei= editor.getEditorInput();
- if (ei instanceof IFileEditorInput) {
- IFileEditorInput fi= (IFileEditorInput) ei;
- return getMatches(fi.getFile());
- }
- return EMPTY_ARR;
- }
-
- public boolean isShownInEditor(Match match, IEditorPart editor) {
- IEditorInput ei= editor.getEditorInput();
- if (ei instanceof IFileEditorInput) {
- IFileEditorInput fi= (IFileEditorInput) ei;
- return match.getElement().equals(fi.getFile());
- }
- return false;
- }
-
- public Match[] computeContainedMatches(AbstractTextSearchResult result,
- IFile file) {
- return getMatches(file);
- }
-
- public IFile getFile(Object element) {
- if (element instanceof IFile)
- return (IFile)element;
- return null;
- }
-
-}
15 years
JBoss Tools SVN: r18009 - in trunk/esb/plugins/org.jboss.tools.esb.core/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-09 09:47:29 -0400 (Fri, 09 Oct 2009)
New Revision: 18009
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5004
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-10-09 13:02:39 UTC (rev 18008)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-10-09 13:47:29 UTC (rev 18009)
@@ -122,3 +122,8 @@
ESB.parameter_reload_secs=Parameter Reload Secs
ESB.context=Context
ESB.handler_class=Handler Class
+ESB.in_xsd=In XSD
+ESB.out_xsd=Out XSD
+ESB.fault_xsd=Fault XSD
+ESB.validate=Validate
+ESB.webservice=Webservice
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2009-10-09 13:02:39 UTC (rev 18008)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2009-10-09 13:47:29 UTC (rev 18009)
@@ -121,41 +121,18 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="in xsd"
- visibility="false" xmlname="inXsd">
+ <XModelAttribute PROPERTIES="category=advanced" name="in xsd" xmlname="inXsd"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="out xsd" xmlname="outXsd"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="fault xsd" xmlname="faultXsd"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="webservice" xmlname="webservice">
<Constraint loader="ListString">
- <value name="RequestResponse"/>
- <value name="OneWay"/>
- </Constraint>
- <Editor name="ListString"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="out xsd"
- visibility="false" xmlname="outXsd">
- <Constraint loader="ListString">
- <value name="RequestResponse"/>
- <value name="OneWay"/>
- </Constraint>
- <Editor name="ListString"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="fault xsd"
- visibility="false" xmlname="faultXsd">
- <Constraint loader="ListString">
- <value name="RequestResponse"/>
- <value name="OneWay"/>
- </Constraint>
- <Editor name="ListString"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="webservice"
- visibility="false" xmlname="webservice">
- <Constraint loader="ListString">
<value/>
<value name="true"/>
<value name="false"/>
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="validate"
- visibility="false" xmlname="validate">
+ <XModelAttribute PROPERTIES="category=advanced" name="validate" xmlname="validate">
<Constraint loader="ListString">
<value/>
<value name="true"/>
15 years