JBoss Tools SVN: r26376 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 09:42:01 -0500 (Tue, 09 Nov 2010)
New Revision: 26376
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
[JBIDE-7518] loading images and instances from server after editing -> notifies listeners of changes
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 14:40:06 UTC (rev 26375)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 14:42:01 UTC (rev 26376)
@@ -22,6 +22,8 @@
(createInstanceFilter):
(updateInstanceFilter):
[JBIDE-7518] cleanup code duplication (imageFilter and instanceFilter creation)
+ (editCloud):
+ [JBIDE-7518] load images and instances after editing the cloud -> notifies listeners of changes
2010-11-05 André Dietisheim <adietish(a)redhat.com>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 14:40:06 UTC (rev 26375)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 14:42:01 UTC (rev 26376)
@@ -90,11 +90,6 @@
this.type = type;
storePassword(url, username, passwd);
save();
- // // TODO: remove notification with all instances, replace by notifying
- // // the changed instance
- // /* notification is needed to refresh instances and images */
- // notifyInstanceListListeners(instances.toArray(instances.toArray(new
- // DeltaCloudInstance[instances.size()])));
loadInstances();
loadImages();
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26375 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 09:40:06 -0500 (Tue, 09 Nov 2010)
New Revision: 26375
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
[JBIDE-7518] loading images and instances from server after editing -> update the tree if you edited the url
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 14:39:37 UTC (rev 26374)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 14:40:06 UTC (rev 26375)
@@ -90,9 +90,13 @@
this.type = type;
storePassword(url, username, passwd);
save();
- // TODO: remove notification with all instances, replace by notifying
- // the changed instance
- notifyInstanceListListeners(instances.toArray(instances.toArray(new DeltaCloudInstance[instances.size()])));
+ // // TODO: remove notification with all instances, replace by notifying
+ // // the changed instance
+ // /* notification is needed to refresh instances and images */
+ // notifyInstanceListListeners(instances.toArray(instances.toArray(new
+ // DeltaCloudInstance[instances.size()])));
+ loadInstances();
+ loadImages();
}
private void storePassword(String url, String username, String passwd) {
@@ -162,9 +166,9 @@
private IInstanceFilter createInstanceFilter(String ruleString) {
IInstanceFilter instanceFilter = null;
- if (IInstanceFilter.ALL_STRING.equals(ruleString))
+ if (IInstanceFilter.ALL_STRING.equals(ruleString)) {
instanceFilter = new AllInstanceFilter();
- else {
+ } else {
try {
instanceFilter = new InstanceFilter();
instanceFilter.setRules(ruleString);
@@ -190,9 +194,9 @@
private IImageFilter createImageFilter(String ruleString) {
IImageFilter imageFilter = null;
- if (IImageFilter.ALL_STRING.equals(ruleString))
+ if (IImageFilter.ALL_STRING.equals(ruleString)) {
imageFilter = new AllImageFilter();
- else {
+ } else {
try {
imageFilter = new ImageFilter();
imageFilter.setRules(ruleString);
@@ -208,8 +212,8 @@
@Override
public void run() {
- getImages();
- getInstances();
+ loadImages();
+ loadInstances();
}
});
@@ -275,7 +279,15 @@
}
}
- public DeltaCloudInstance[] getInstances() {
+ /**
+ * Loads the instances from the server and stores them in this instance.
+ * Furthermore listeners get informed.
+ *
+ * @return the instances
+ *
+ * @see #notifyInstanceListListeners(DeltaCloudInstance[])
+ */
+ public DeltaCloudInstance[] loadInstances() {
synchronized (instanceLock) {
instances = new ArrayList<DeltaCloudInstance>();
try {
@@ -298,7 +310,7 @@
public DeltaCloudInstance[] getCurrInstances() {
synchronized (instanceLock) {
if (instances == null) {
- return getInstances();
+ return loadInstances();
}
DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()];
instanceArray = instances.toArray(instanceArray);
@@ -371,6 +383,7 @@
if (!(retVal.getState().equals(DeltaCloudInstance.BOGUS))
&& !(inst.getState().equals(retVal.getState()))) {
instances.set(i, retVal);
+ // TODO: is this correct? getCurrInstances notifies, too
notifyInstanceListListeners(getCurrInstances());
return retVal;
}
@@ -430,7 +443,15 @@
return profileArray;
}
- public DeltaCloudImage[] getImages() {
+ /**
+ * Loads the available images from the server and stores them locally.
+ * Furthermore listeners get informed.
+ *
+ * @return the delta cloud image[]
+ *
+ * @see #notifyImageListListeners(DeltaCloudImage[])
+ */
+ public DeltaCloudImage[] loadImages() {
synchronized (imageLock) {
images = new ArrayList<DeltaCloudImage>();
try {
@@ -452,7 +473,7 @@
public DeltaCloudImage[] getCurrImages() {
synchronized (imageLock) {
if (images == null)
- return getImages();
+ return loadImages();
DeltaCloudImage[] imageArray = new DeltaCloudImage[images.size()];
imageArray = images.toArray(imageArray);
return imageArray;
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26374 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 09:39:37 -0500 (Tue, 09 Nov 2010)
New Revision: 26374
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java
Log:
[JBIDE-7518] loading images and instances from server after editing -> update the tree if you edited the url
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-09 14:36:48 UTC (rev 26373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-09 14:39:37 UTC (rev 26374)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="askclear" value="true"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
@@ -11,9 +11,9 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Deltacloud Tools"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.eclipse.epp.usagedata.ui,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/>
<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.help.ui@default:default,org.eclipse.team.core@default:default,org.apache.lucene.analysis@default:default,org.jboss.tools.common@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime@default:true,org.eclipse.compare@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.ecf@default:default,org.eclipse.jface@default:default,org.eclipse.ui.ide.application@default:defau!
lt,org.eclipse.core.variables@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.xml@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.eclipse.ui.ide@default:default,org.junit4@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.wst.common.core@default:default,javax.servlet.jsp@default:default,org.eclipse.!
jem.util@default:default,org.eclipse.jdt.core.manipulation@def!
ault:def
ault,org.apache.commons.el@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jface.text@default:default,org.eclipse.rse.services@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.help.appserver@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.help.webapp@default:default,org.eclipse.core.net@default:default,org.eclipse.osgi@-1:true,org.eclipse.wst.common.emf@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.views@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.sw!
t.gtk.linux.x86_64@default:false,org.eclipse.core.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.xml.resolver@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.forms@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.help@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.app@!
default:default,org.eclipse.jdt.debug@default:default,org.ecli!
pse.core
.jobs@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.databinding.property@default:default,org.apache.ant@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.sse.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.repository@default:default,javax.servlet@default:default,org.apache.xerces@default:default,org.eclipse.core.resources@default:default!
,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.sdk@default:default,org.apache.jasper@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.text@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.search@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jface.databinding@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.debug.core@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.test@default:default,org.jruby.jruby@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.expressions@default:default,org.eclipse.text@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.security@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.update.configurator@3:true,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jem.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.commands@de!
fault:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.common@2:true,javax.xml@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.osgi.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.compare.core@default:default,org.mortbay.jetty.util@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.filesyst!
em@default:default,org.junit4@default:default,org.eclipse.ltk.!
core.ref
actoring@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.rse.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.apache.ant@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.help@default:default,javax.servlet@default:default,org.apache.commons.el@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.editors@default:default,org.eclipse.search@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.security.ui@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.meta!
data.repository@default:default,org.eclipse.debug.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,javax.servlet.jsp@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.console@default:default,org.hamcrest.core@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.wst.common.environment@default:default,com.ibm.icu@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.sdk@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ecf@default:default!
,org.apache.lucene.analysis@default:default,org.eclipse.compar!
e@defaul
t:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.jface@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.help.base@default:default,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.sse.core@default:default,org.apache.xerces@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.ecore!
.change@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@-1:true,org.apache.jasper@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.app@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java 2010-11-09 14:36:48 UTC (rev 26373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java 2010-11-09 14:39:37 UTC (rev 26374)
@@ -13,11 +13,13 @@
import java.util.Collection;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.ListSelectionDialog;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.views.CVInstanceElement;
/**
@@ -29,12 +31,11 @@
private static class DeltaCloudInstanceProvider implements IStructuredContentProvider {
- @SuppressWarnings("unchecked")
@Override
- public Object[] getElements(Object cvInstanceElements) {
- Assert.isTrue(cvInstanceElements instanceof Collection);
- Collection<CVInstanceElement> instances = (Collection<CVInstanceElement>) cvInstanceElements;
- return instances.toArray(new CVInstanceElement[instances.size()]);
+ public Object[] getElements(Object deltaCloudInstances) {
+ Assert.isTrue(deltaCloudInstances instanceof Collection);
+ Collection<?> instances = (Collection<?>) deltaCloudInstances;
+ return instances.toArray(new Object[instances.size()]);
}
@Override
@@ -48,6 +49,11 @@
private static class CloudElementNameProvider extends LabelProvider {
public String getText(Object element) {
+ Assert.isTrue(element instanceof IAdaptable);
+ DeltaCloudInstance deltaCloudInstance = (DeltaCloudInstance) ((IAdaptable) element).getAdapter(DeltaCloudInstance.class);
+ if (deltaCloudInstance != null) {
+ return deltaCloudInstance.getName();
+ }
return ((CVInstanceElement) element).getName();
}
};
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-09 14:36:48 UTC (rev 26373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-09 14:39:37 UTC (rev 26374)
@@ -11,6 +11,7 @@
package org.jboss.tools.deltacloud.ui.views;
import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
public class CVInstanceElement extends CloudViewElement {
@@ -22,4 +23,17 @@
public IPropertySource getPropertySource() {
return new InstancePropertySource(this, getElement());
}
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ public Object getAdapter(Class adapter) {
+ System.err.println("CVInstanceElement#getAdapter: adapter = " + adapter);
+ Object adapted = super.getAdapter(adapter);
+ if (adapted == null && adapter == DeltaCloudInstance.class) {
+ adapted = getElement();
+ }
+
+ return adapted;
+ }
+
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-09 14:36:48 UTC (rev 26373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-09 14:39:37 UTC (rev 26374)
@@ -318,7 +318,7 @@
@Override
public void run() {
if (currCloud != null) {
- currCloud.getImages();
+ currCloud.loadImages();
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-09 14:36:48 UTC (rev 26373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-09 14:39:37 UTC (rev 26374)
@@ -20,11 +20,8 @@
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
import org.eclipse.jface.layout.TableColumnLayout;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ColumnWeightData;
@@ -55,15 +52,14 @@
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
@@ -76,6 +72,7 @@
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
+import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
import org.jboss.tools.internal.deltacloud.ui.wizards.InstanceFilter;
import org.osgi.service.prefs.Preferences;
@@ -86,8 +83,8 @@
*/
public static final String ID = "org.jboss.tools.deltacloud.ui.views.InstanceView";
-// private static final String CONTEXT_MENU_ID = "popup:" + ID;
-// private static final String VIEW_MENU_ID = "menu:" + ID;
+ private static final String CONTEXT_MENU_ID = "popup:" + ID;
+ private static final String VIEW_MENU_ID = "menu:" + ID;
private final static String CLOUD_SELECTOR_LABEL = "CloudSelector.label"; //$NON-NLS-1$
private final static String START_LABEL = "Start.label"; //$NON-NLS-1$
@@ -122,7 +119,7 @@
private IAction refreshAction;
private IAction filterAction;
- private IAction startAction;
+// private IAction startAction;
private IAction stopAction;
private IAction destroyAction;
private IAction rebootAction;
@@ -146,8 +143,6 @@
}
currCloud = clouds[index];
storeSelectedCloud();
-// viewer.setInput(new DeltaCloudInstance[0]);
-// viewer.refresh();
Display.getCurrent().asyncExec(new Runnable() {
@Override
@@ -168,7 +163,6 @@
// do nothing
}
}
-
};
private class ColumnListener extends SelectionAdapter {
@@ -221,7 +215,7 @@
filterLabel.setToolTipText(CVMessages.getString(FILTERED_TOOLTIP));
Composite tableArea = new Composite(container, SWT.NULL);
- createTableViewer(tableArea);
+ viewer = createTableViewer(tableArea);
if (currCloud != null) {
currCloud.removeInstanceListListener(parentView);
@@ -260,18 +254,19 @@
// Create the help context id for the viewer's control
PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer");
makeActions();
- hookContextMenu();
+ hookContextMenu(viewer.getTable());
hookSelection();
contributeToActionBars();
+ getSite().setSelectionProvider(viewer);
DeltaCloudManager.getDefault().addCloudManagerListener(this);
}
- private void createTableViewer(Composite tableArea) {
+ private TableViewer createTableViewer(Composite tableArea) {
TableColumnLayout tableLayout = new TableColumnLayout();
tableArea.setLayout(tableLayout);
- viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.MULTI);
+ TableViewer viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.MULTI);
Table table = viewer.getTable();
table.setHeaderVisible(true);
table.setLinesVisible(true);
@@ -280,18 +275,24 @@
viewer.setLabelProvider(contentProvider);
InstanceComparator comparator = new InstanceComparator(0);
viewer.setComparator(comparator);
+ createColumns(tableLayout, table);
+ table.setSortDirection(SWT.NONE);
+ return viewer;
+
+ }
+ private void createColumns(TableColumnLayout tableLayout, Table table) {
for (int i = 0; i < InstanceViewLabelAndContentProvider.Column.getSize(); ++i) {
InstanceViewLabelAndContentProvider.Column c =
InstanceViewLabelAndContentProvider.Column.getColumn(i);
TableColumn tc = new TableColumn(table, SWT.NONE);
- if (i == 0)
+ if (i == 0) {
table.setSortColumn(tc);
+ }
tc.setText(CVMessages.getString(c.name()));
tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
tc.addSelectionListener(new ColumnListener(i, viewer));
}
- table.setSortDirection(SWT.NONE);
}
private Label createCloudSelector() {
@@ -317,21 +318,25 @@
@Override
public void selectionChanged(SelectionChangedEvent event) {
handleSelection();
+ System.err.println(event.getSelection());
}
});
}
- private void hookContextMenu() {
- MenuManager menuMgr = new MenuManager("#PopupMenu");
- menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- InstanceView.this.fillContextMenu(manager);
- }
- });
- Menu menu = menuMgr.createContextMenu(viewer.getControl());
- viewer.getControl().setMenu(menu);
- getSite().registerContextMenu(menuMgr, viewer);
+ private void hookContextMenu(Control control) {
+ IMenuManager contextMenu = UIUtils.createContextMenu(control);
+ UIUtils.registerContributionManager(CONTEXT_MENU_ID, contextMenu, control);
+
+// MenuManager menuMgr = new MenuManager("#PopupMenu");
+// menuMgr.setRemoveAllWhenShown(true);
+// menuMgr.addMenuListener(new IMenuListener() {
+// public void menuAboutToShow(IMenuManager manager) {
+// InstanceView.this.fillContextMenu(manager);
+// }
+// });
+// Menu menu = menuMgr.createContextMenu(viewer.getControl());
+// viewer.getControl().setMenu(menu);
+// getSite().registerContextMenu(menuMgr, viewer);
}
private void contributeToActionBars() {
@@ -343,15 +348,12 @@
private void handleSelection() {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
selectedElement = (DeltaCloudInstance) selection.getFirstElement();
- instanceActions.get(DeltaCloudInstance.START).setEnabled(false);
+// instanceActions.get(DeltaCloudInstance.START).setEnabled(false);
instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false);
instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false);
instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false);
if (selectedElement != null) {
- List<String> actions = selectedElement.getActions();
- for (String action : actions) {
- instanceActions.get(action).setEnabled(true);
- }
+ enableActions(selectedElement.getActions());
}
}
@@ -361,32 +363,39 @@
}
private void fillContextMenu(IMenuManager manager) {
- List<String> actions = selectedElement.getActions();
- manager.add(instanceActions.get(DeltaCloudInstance.START));
- instanceActions.get(DeltaCloudInstance.START).setEnabled(false);
- manager.add(instanceActions.get(DeltaCloudInstance.STOP));
- instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false);
- manager.add(instanceActions.get(DeltaCloudInstance.REBOOT));
- instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false);
- manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
- manager.add(instanceActions.get(DeltaCloudInstance.DESTROY));
- instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false);
- for (String action : actions) {
- instanceActions.get(action).setEnabled(true);
+// List<String> actions = selectedElement.getActions();
+// manager.add(instanceActions.get(DeltaCloudInstance.START));
+// instanceActions.get(DeltaCloudInstance.START).setEnabled(false);
+// manager.add(instanceActions.get(DeltaCloudInstance.STOP));
+// instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false);
+// manager.add(instanceActions.get(DeltaCloudInstance.REBOOT));
+// instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false);
+// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+// manager.add(instanceActions.get(DeltaCloudInstance.DESTROY));
+// instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false);
+// enableActions(actions);
+// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+// manager.add(rseAction);
+// if (selectedElement.getState().equals(DeltaCloudInstance.RUNNING) ||
+// selectedElement.getState().equals(DeltaCloudInstance.STOPPED))
+// rseAction.setEnabled(true);
+// else
+// rseAction.setEnabled(false);
+// // Other plug-ins can contribute there actions here
+// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+ }
+
+ private void enableActions(List<String> actions) {
+ for (String actionId : actions) {
+ IAction action = instanceActions.get(actionId);
+ if (action != null) {
+ action.setEnabled(true);
+ }
}
- manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
- manager.add(rseAction);
- if (selectedElement.getState().equals(DeltaCloudInstance.RUNNING) ||
- selectedElement.getState().equals(DeltaCloudInstance.STOPPED))
- rseAction.setEnabled(true);
- else
- rseAction.setEnabled(false);
- // Other plug-ins can contribute there actions here
- manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
private void fillLocalToolBar(IToolBarManager manager) {
- manager.add(instanceActions.get(DeltaCloudInstance.START));
+// manager.add(instanceActions.get(DeltaCloudInstance.START));
manager.add(instanceActions.get(DeltaCloudInstance.STOP));
manager.add(instanceActions.get(DeltaCloudInstance.REBOOT));
manager.add(instanceActions.get(DeltaCloudInstance.DESTROY));
@@ -395,14 +404,19 @@
private void makeActions() {
this.refreshAction = createRefreshAction();
this.filterAction = createFilterAction();
- this.startAction = createStartAction();
+
+ IActionBars actionBars = getViewSite().getActionBars();
+ IMenuManager menuManager = actionBars.getMenuManager();
+ UIUtils.registerContributionManager(VIEW_MENU_ID, menuManager, viewer.getControl());
+
+// this.startAction = createStartAction();
this.stopAction = createStopAction();
this.rebootAction = createRebootAction();
this.destroyAction = createDestroyAction();
this.rseAction = createRseAction();
instanceActions = new HashMap<String, IAction>();
- instanceActions.put(DeltaCloudInstance.START, startAction);
+// instanceActions.put(DeltaCloudInstance.START, startAction);
instanceActions.put(DeltaCloudInstance.STOP, stopAction);
instanceActions.put(DeltaCloudInstance.REBOOT, rebootAction);
instanceActions.put(DeltaCloudInstance.DESTROY, destroyAction);
@@ -610,7 +624,7 @@
@Override
public void run() {
if (currCloud != null) {
- currCloud.getInstances();
+ currCloud.loadInstances();
}
}
@@ -625,10 +639,6 @@
return refreshAction;
}
- @Override
- public void setFocus() {
- viewer.getControl().setFocus();
- }
private void initializeCloudSelector() {
int defaultIndex = 0;
@@ -699,4 +709,8 @@
}
}
+ @Override
+ public void setFocus() {
+ viewer.getControl().setFocus();
+ }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-09 14:36:48 UTC (rev 26373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-09 14:39:37 UTC (rev 26374)
@@ -31,7 +31,7 @@
String archRule = mainPage.getArchRule();
String descRule = mainPage.getDescRule();
- cloud.createImageFilter(nameRule + ";" + //$NON-NLS-1$
+ cloud.updateImageFilter(nameRule + ";" + //$NON-NLS-1$
idRule + ";" + //$NON-NLS-1$
archRule + ";" + //$NON-NLS-1$
descRule); //$NON-NLS-1$
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-09 14:36:48 UTC (rev 26373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-09 14:39:37 UTC (rev 26374)
@@ -34,7 +34,7 @@
String realmRule = mainPage.getRealmRule();
String profileRule = mainPage.getProfileRule();
- cloud.createInstanceFilter(nameRule + ";" + //$NON-NLS-1$
+ cloud.updateInstanceFilter(nameRule + ";" + //$NON-NLS-1$
idRule + ";" + //$NON-NLS-1$
imageIdRule + ";" + //$NON-NLS-1$
ownerIdRule + ";" + //$NON-NLS-1$
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26373 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 09:36:48 -0500 (Tue, 09 Nov 2010)
New Revision: 26373
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java
Log:
[JBIDE-7518] cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-09 14:33:20 UTC (rev 26372)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-09 14:36:48 UTC (rev 26373)
@@ -77,12 +77,6 @@
}
@Override
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (newInput != null) {
if (newInput instanceof DeltaCloudInstance[]) {
@@ -141,7 +135,6 @@
case ID:
return i.getId();
case STATUS:
-// return i.getState();
return "";
case HOSTNAME:
return i.getHostName();
@@ -150,4 +143,8 @@
return "";
}
+ @Override
+ public void dispose() {
+ }
+
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26372 - trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-09 09:33:20 -0500 (Tue, 09 Nov 2010)
New Revision: 26372
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties
Log:
JBIDE-7193
https://jira.jboss.org/browse/JBIDE-7193
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2010-11-09 14:32:22 UTC (rev 26371)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2010-11-09 14:33:20 UTC (rev 26372)
@@ -25,6 +25,7 @@
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
import org.jboss.tools.esb.core.model.ESBConstants;
import org.jboss.tools.esb.core.model.converters.ConverterConstants;
+import org.jboss.tools.esb.core.model.impl.BusinessRulesProcessor;
import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
@@ -292,6 +293,14 @@
for (XModelObject path: ps) {
validateObjectPathForBusinessRulesProcessor(path, object, file);
}
+
+ String ruleMultithreadEvaluation = object.getAttributeValue(BusinessRulesProcessor.ATTR_RULE_MULTITHREAD_EVALUATION);
+ String ruleMaxThreads = object.getAttributeValue(BusinessRulesProcessor.ATTR_RULE_MAX_THREADS);
+ if(!"true".equals(ruleMultithreadEvaluation) && ruleMaxThreads != null && ruleMaxThreads.length() > 0) { //$NON-NLS-1$
+ IMarker marker = addError(ESBValidatorMessages.INVALID_RULE_MAX_THREADS,
+ ESBPreferences.BUSINESS_RULES_PROCESSOR_PROBLEMS, getSourceReference(object, BusinessRulesProcessor.ATTR_RULE_MAX_THREADS), file);
+ bindMarkerToPathAndAttribute(marker, object, BusinessRulesProcessor.ATTR_RULE_MAX_THREADS);
+ }
}
static String ATTR_ESB = "esb"; //$NON-NLS-1$
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java 2010-11-09 14:32:22 UTC (rev 26371)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidatorMessages.java 2010-11-09 14:33:20 UTC (rev 26372)
@@ -27,6 +27,7 @@
public static String INVALID_RULE_AUDIT_TYPE_AND_INTERVAL;
public static String INVALID_OBJECT_PATH_WRONG_LOCATION;
+ public static String INVALID_RULE_MAX_THREADS;
static {
NLS.initializeMessages(BUNDLE_NAME, ESBValidatorMessages.class);
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties 2010-11-09 14:32:22 UTC (rev 26371)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/messages.properties 2010-11-09 14:33:20 UTC (rev 26372)
@@ -7,4 +7,5 @@
INVALID_RULE_SET_FOR_RULE_LANGUAGE=If "ruleLanguage" is specified, the file in "ruleSet" should be a ".dslr" file
INVALID_RULE_AUDIT_TYPE_AND_INTERVAL=If "ruleAuditInterval" is specified, it only applies for a "ruleAuditType" of "THREADED_FILE"
-INVALID_OBJECT_PATH_WRONG_LOCATION=Invalid object-path: location should be one of body, header, properties, attachment
\ No newline at end of file
+INVALID_OBJECT_PATH_WRONG_LOCATION=Invalid object-path: location should be one of body, header, properties, attachment
+INVALID_RULE_MAX_THREADS=Property "ruleMaxThreads" only applies if "ruleMultithreadEvaluation" is true
\ No newline at end of file
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26371 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-09 09:32:22 -0500 (Tue, 09 Nov 2010)
New Revision: 26371
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java
Log:
JBIDE-7193
https://jira.jboss.org/browse/JBIDE-7193
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java 2010-11-09 14:10:22 UTC (rev 26370)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java 2010-11-09 14:32:22 UTC (rev 26371)
@@ -6,6 +6,8 @@
private static final long serialVersionUID = 1L;
public static String ATTR_RULE_AGENT_PROPERTIES = "rule agent properties";
public static String ATTR_DECISION_TABLE = "decision table";
+ public static String ATTR_RULE_MAX_THREADS = "rule max threads";
+ public static String ATTR_RULE_MULTITHREAD_EVALUATION = "rule multithread evaluation";
static int RULE_SET_BASED = 0;
static int RULE_AGENT_BASED = 1;
@@ -25,9 +27,8 @@
int kind = getKind();
return kind < 0 || kind == DECISION_TABLE_BASED;
}
- String ATTR_RULE_MAX_THREADS = "rule max threads";
if(ATTR_RULE_MAX_THREADS.equals(name)) {
- String a = getAttributeValue("rule multithread evaluation");
+ String a = getAttributeValue(ATTR_RULE_MULTITHREAD_EVALUATION);
if("true".equals(a)) return true;
String b = getAttributeValue(ATTR_RULE_MAX_THREADS);
return b != null && b.length() > 0;
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26370 - in trunk: jsf/plugins/org.jboss.tools.jsf.text.ext and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-11-09 09:10:22 -0500 (Tue, 09 Nov 2010)
New Revision: 26370
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-7460
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370)
@@ -231,6 +231,14 @@
<axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jstl/core]:import/url" />
+ <axis path="*/[http://java.sun.com/jstl/core]:redirect/url" />
+ <axis path="*/[http://java.sun.com/jsp/jstl/core]:import/url" />
+ <axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -631,6 +639,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
+ </contenttypeidentifier>
</hyperlink>
</extension>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370)
@@ -414,6 +414,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -440,6 +443,13 @@
<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:outputStylesheet/name/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputScript/name/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -454,6 +464,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -486,6 +499,15 @@
<axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:commandButton/action/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:commandLink/action/" />
+
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/action/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -599,6 +621,42 @@
<axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converter/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/core]:converter/converterId/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputHidden/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputSecret/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputText/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputTextarea/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputFormat/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputLabel/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputLink/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputText/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectBooleanCheckbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectManyCheckbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectManyListbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectManyMenu/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectOneListbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectOneMenu/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectOneRadio/converter/" />
+
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputHidden/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputSecret/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputText/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputTextarea/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputFormat/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLink/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputText/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectBooleanCheckbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyCheckbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyListbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyMenu/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneListbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneMenu/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converter/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -619,6 +677,11 @@
<axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -651,6 +714,15 @@
<axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:outputLabel/for/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:message/for/" />
+
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/for/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPExprHyperlinkPartitioner"
@@ -679,6 +751,14 @@
<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
+ <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+ <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -699,6 +779,11 @@
<!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -717,6 +802,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -746,6 +834,14 @@
<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+ <axis path="*/[http://java.sun.com/jsf/core]:valueChangeListener/type/" />
+ <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+ <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -784,6 +880,17 @@
<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:commandButton/image/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/value/" />
+ <axis path="*/img/src/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/url/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/image/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/value/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -798,6 +905,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -812,6 +922,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -826,6 +939,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
+ </contentType>
</hyperlinkPartitioner>
</extension>
@@ -939,6 +1055,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -957,6 +1076,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -994,6 +1116,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1008,6 +1133,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1022,6 +1150,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CONVERTER" />
</contenttypeidentifier>
@@ -1054,6 +1185,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1068,6 +1202,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
+ </contenttypeidentifier>
</hyperlink>
<!-- Faces Config File -->
@@ -1101,6 +1238,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1115,6 +1255,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1129,6 +1272,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1143,6 +1289,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1157,6 +1306,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1171,6 +1323,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1185,6 +1340,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.core.runtime.xml">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
</contenttypeidentifier>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370)
@@ -19,6 +19,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -33,6 +36,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -62,6 +68,14 @@
<axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/facelets]:composition/template/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:decorate/template/" />
+ <axis path="*/[http://jboss.com/products/seam/taglib]:decorate/template/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -109,6 +123,20 @@
<axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/id/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/binding/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/rendered/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:define/name/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:fragment/id/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:fragment/binding/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:insert/name/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:param/name/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -129,6 +157,11 @@
<axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -183,6 +216,22 @@
<axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:*/columnClasses/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/footerClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/headerClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/rowClasses/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/captionClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/styleClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/errorClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/fatalClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/infoClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/warnClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/disabledClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
</extension>
@@ -204,6 +253,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
+ </contenttypeidentifier>
</hyperlink>
</extension>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370)
@@ -124,6 +124,44 @@
<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/a4j]:include/viewId/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" />
+ <axis path="*/[http://richfaces.org/a4j]:commandButton/image/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadScript/src/" />
+ <axis path="*/[http://richfaces.org/rich]:insert/src/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -243,6 +281,44 @@
<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" >
+ <axis path="*/[http://richfaces.org/a4j]:include/viewId/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" />
+ <axis path="*/[http://richfaces.org/a4j]:commandButton/image/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadScript/src/" />
+ <axis path="*/[http://richfaces.org/rich]:insert/src/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -260,6 +336,10 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -278,6 +358,10 @@
<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -412,6 +496,49 @@
<axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/a4j]:*/focus/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/focus/" />
+ <axis path="*/[http://richfaces.org/rich]:*/focus/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/focus/" />
+
+ <axis path="*/[http://richfaces.org/a4j]:*/reRender/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/reRender/" />
+ <axis path="*/[http://richfaces.org/rich]:*/reRender/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/reRender/" />
+
+ <axis path="*/[http://richfaces.org/a4j]:*/status/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/status/" />
+ <axis path="*/[http://richfaces.org/rich]:*/status/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/status/" />
+
+ <axis path="*/[http://richfaces.org/a4j]:*/for/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/for/" />
+ <axis path="*/[http://richfaces.org/rich]:*/for/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/for/" />
+
+ <axis path="*/[http://richfaces.org/rich]:effect/targetId/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:effect/targetId/" />
+
+ <axis path="*/[http://richfaces.org/rich]:toggleControl/panelId/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:toggleControl/panelId/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/dragIndicator/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/dragIndicator/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/process/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/process/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/similarityGroupingId/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/similarityGroupingId/" />
+
+ <axis path="*/[http://richfaces.org/rich]:progressBar/reRenderAfterComplete/" />
+
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:componentControl/attachTo/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -450,6 +577,17 @@
<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/a4j]:*/converter/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/converter/" />
+ <axis path="*/[http://richfaces.org/rich]:*/converter/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/converter/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/rowKeyConverter/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -746,6 +884,103 @@
<axis path="*/[http://richfaces.org/rich]:*/nodeClass/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/rich]:*/addButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/activeClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/activeTabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/buttonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/buttonDisabledClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/buttonInactiveClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/barClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/bottomControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/bodyClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/columnClasses/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlsClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlHoverClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlPressedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlPressClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/cleanButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/changedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/changedHoverClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/copyAllControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/copyControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/contentClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/completeClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/dayStyleClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/decreaseClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/decreaseSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/downControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledGroupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/errorClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/errorLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/errorMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/entryClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/footerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fileEntryClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fileEntryControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fatalClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fatalLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fatalMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/finishClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/headerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/handleClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/handleSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/hoveredGroupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/hoveredItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/highlightedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inputClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inputDisabledClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inputInactiveClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/itemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/itemSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/increaseClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/increaseSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/iconClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/infoClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/infoLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/infoMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/initialClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/listClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/labelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/popupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/rowClasses/" />
+ <axis path="*/[http://richfaces.org/rich]:*/removeAllControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/removeControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/remainClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/styleClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/stopButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/sidebarClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectValueClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/separatorClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/uploadButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/uploadListClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/upControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/editClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/viewClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/viewHoverClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/tipClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/topControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/topGroupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/topItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/tabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/markerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/warnClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/warnLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/warnMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/groupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledTabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inactiveTabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/nodeClass/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
</extension>
@@ -767,6 +1002,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -781,6 +1019,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
</extension>
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370)
@@ -20,6 +20,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -37,6 +40,10 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<!--Maksim Areshkau, partitioner for *.taglib.xml files -->
@@ -108,6 +115,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -122,6 +132,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -136,6 +149,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -150,6 +166,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -231,6 +250,17 @@
<!--axis path="*/style/" /-->
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/link/*" ignoreCase="true"/>
+ </partitionType>
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT">
+ <axis path="*/link/*" ignoreCase="true"/>
+ </partitionType>
+ <partitionType id="com.ibm.sse.STYLE">
+ <!--axis path="*/style/" /-->
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -266,6 +296,12 @@
<axis path="*/link/href/" ignoreCase="true"/>
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/a/href/" ignoreCase="true"/>
+ <axis path="*/link/href/" ignoreCase="true"/>
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<!-- End of Common HTML and/or JSP hyperlink partitioners -->
@@ -288,6 +324,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -322,6 +361,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -416,6 +458,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370)
@@ -74,6 +74,12 @@
<axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://jboss.com/products/seam/taglib]:button/action/" />
+ <axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -135,6 +141,9 @@
<contentType id="jsf.facelet">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
<contentType id="org.eclipse.core.runtime.xml">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
@@ -220,7 +229,12 @@
<axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" />
</partitionType>
</contentType>
-
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://jboss.com/products/seam/taglib]:button/view/" />
+ <axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" />
+ </partitionType>
+ </contentType>
<contentType id="org.eclipse.core.runtime.xml">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/view-id/" />
@@ -253,6 +267,11 @@
<axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet.composite">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -313,6 +332,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.core.runtime.xml">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
</contenttypeidentifier>
@@ -351,7 +373,9 @@
<contenttypeidentifier id="jsf.facelet">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
</contenttypeidentifier>
-
+ <contenttypeidentifier id="jsf.facelet.composite">
+ <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.core.runtime.xml">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
</contenttypeidentifier>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26369 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 08:49:25 -0500 (Tue, 09 Nov 2010)
New Revision: 26369
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java
Log:
[JBIDE-7518] removed duplicate code for matcher creation
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 13:44:59 UTC (rev 26368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 13:49:25 UTC (rev 26369)
@@ -1,6 +1,19 @@
2010-11-09 André Dietisheim <adietish(a)redhat.com>
- * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (editCloud): [JBIDE-7521] storing cloud after it has been edited
+ * src/org/jboss/tools/deltacloud/core/ImageFilter.java (setRules):
+ * src/org/jboss/tools/deltacloud/core/InstanceFilter.java
+ (setRules):
+ (createRule):
+ [JBIDE-7518] removed duplicate code for matcher creation
+ (createRule):
+ (setRules):
+ [JBIDE-7518] removed duplicate code for matcher creation
+ * src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java:
+ * src/org/jboss/tools/deltacloud/core/IImageFilter.java:
+ * src/org/jboss/tools/deltacloud/core/IInstanceFilter.java
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (editCloud):
+ [JBIDE-7521] storing cloud after it has been edited
(editCloud):
[JBIDE-7518] added notification after cloud was edited
(DeltaCloud):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java 2010-11-09 13:44:59 UTC (rev 26368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java 2010-11-09 13:49:25 UTC (rev 26369)
@@ -12,15 +12,15 @@
public interface ICloudElementFilter {
- public static final String RULE_DELIMITER = ";"; // $NON-NLS-1$
+ public static final String EXPRESSION_DELIMITER = ";"; // $NON-NLS-1$
- public static final String ALL_MATCHER = "*"; //$NON-NLS-1$
+ public static final String ALL_MATCHER_EXPRESSION = "*"; //$NON-NLS-1$
public static final String ALL_STRING =
- ALL_MATCHER + RULE_DELIMITER // name
- + ALL_MATCHER + RULE_DELIMITER // id
- + ALL_MATCHER + RULE_DELIMITER // arch
- + ALL_MATCHER; // desc
+ ALL_MATCHER_EXPRESSION + EXPRESSION_DELIMITER // name
+ + ALL_MATCHER_EXPRESSION + EXPRESSION_DELIMITER // id
+ + ALL_MATCHER_EXPRESSION + EXPRESSION_DELIMITER // arch
+ + ALL_MATCHER_EXPRESSION; // desc
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-11-09 13:44:59 UTC (rev 26368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-11-09 13:49:25 UTC (rev 26369)
@@ -38,7 +38,7 @@
}
private IFieldMatcher createRule(String token) {
- if (token.equals(ALL_MATCHER)) { //$NON-NLS-1$
+ if (token.equals(ALL_MATCHER_EXPRESSION)) { //$NON-NLS-1$
return new AllFieldMatcher();
} else {
return new FieldMatcher(token);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java 2010-11-09 13:44:59 UTC (rev 26368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java 2010-11-09 13:49:25 UTC (rev 26369)
@@ -26,41 +26,21 @@
@Override
public void setRules(String ruleString) throws PatternSyntaxException {
String[] tokens = ruleString.split(";");
- if (tokens[0].equals("*")) { //$NON-NLS-1$
- nameRule = new AllFieldMatcher();
+ this.nameRule = createRule(tokens[0]);
+ this.idRule = createRule(tokens[1]);
+ this.imageIdRule = createRule(tokens[2]);
+ this.ownerIdRule = createRule(tokens[3]);
+ this.keyNameRule = createRule(tokens[4]);
+ this.realmRule = createRule(tokens[5]);
+ this.profileRule = createRule(tokens[6]);
+ }
+
+ private IFieldMatcher createRule(String expression) {
+ if (expression.equals(ALL_MATCHER_EXPRESSION)) { //$NON-NLS-1$
+ return new AllFieldMatcher();
} else {
- nameRule = new FieldMatcher(tokens[0]);
+ return new FieldMatcher(expression);
}
- if (tokens[1].equals("*")) { //$NON-NLS-1$
- idRule = new AllFieldMatcher();
- } else {
- idRule = new FieldMatcher(tokens[1]);
- }
- if (tokens[2].equals("*")) { //$NON-NLS-1$
- imageIdRule = new AllFieldMatcher();
- } else {
- imageIdRule = new FieldMatcher(tokens[2]);
- }
- if (tokens[3].equals("*")) { //$NON-NLS-1$
- ownerIdRule = new AllFieldMatcher();
- } else {
- ownerIdRule = new FieldMatcher(tokens[3]);
- }
- if (tokens[4].equals("*")) { //$NON-NLS-1$
- keyNameRule = new AllFieldMatcher();
- } else {
- keyNameRule = new FieldMatcher(tokens[4]);
- }
- if (tokens[5].equals("*")) { //$NON-NLS-1$
- realmRule = new AllFieldMatcher();
- } else {
- realmRule = new FieldMatcher(tokens[5]);
- }
- if (tokens[6].equals("*")) { //$NON-NLS-1$
- profileRule = new AllFieldMatcher();
- } else {
- profileRule = new FieldMatcher(tokens[6]);
- }
}
@Override
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26368 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-09 08:44:59 -0500 (Tue, 09 Nov 2010)
New Revision: 26368
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java
Log:
JBIDE-7500
https://jira.jboss.org/browse/JBIDE-7500
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java 2010-11-09 13:42:08 UTC (rev 26367)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/wizard/NewActionWizardPage.java 2010-11-09 13:44:59 UTC (rev 26368)
@@ -46,6 +46,7 @@
*/
public class NewActionWizardPage extends NewClassWizardPageEx {
public static String PROCESS = "org.jboss.soa.esb.actions.annotation.Process";
+ static String PROCESSOR_CLASS = "org.jboss.soa.esb.actions.AbstractActionPipelineProcessor";
RadioFieldEditor pojo = null;
@@ -126,7 +127,13 @@
protected void createTypeMembers(IType newType, ImportsManager imports, IProgressMonitor monitor) throws CoreException {
super.createTypeMembers(newType, imports, monitor);
- if("true".equals(pojo.getValueAsString())) {
+ String sc = newType.getSuperclassTypeSignature();
+ if(sc != null) {
+ sc = EclipseJavaUtil.resolveTypeAsString(newType, sc);
+ }
+ if("true".equals(pojo.getValueAsString()) &&
+ !PROCESSOR_CLASS.equals(sc) //User just forgot to select 'As Pipeline' option, but since he browsed for superclass, he certainly means that.
+ ) {
modifyJavaSourceForPOJO(newType, imports);
} else {
modifyJavaSourceForAbstractImplementation(newType, imports);
@@ -140,7 +147,7 @@
if(sc != null) {
sc = EclipseJavaUtil.resolveTypeAsString(type, sc);
}
- if(type != null && "org.jboss.soa.esb.actions.AbstractActionPipelineProcessor".equals(sc)) {
+ if(type != null && PROCESSOR_CLASS.equals(sc)) {
ICompilationUnit w = type.getCompilationUnit();
IBuffer b = w.getBuffer();
String s = b.getContents();
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26367 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 08:42:08 -0500 (Tue, 09 Nov 2010)
New Revision: 26367
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java
Log:
[JBIDE-7518] removed unneeded non-nls comments, added copyright header
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java 2010-11-09 13:40:04 UTC (rev 26366)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java 2010-11-09 13:42:08 UTC (rev 26367)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.deltacloud.core;
public class AllImageFilter implements IImageFilter {
@@ -20,19 +30,19 @@
}
public IFieldMatcher getNameRule() {
- return matcher; //$NON-NLS-1$
+ return matcher;
}
public IFieldMatcher getIdRule() {
- return matcher; //$NON-NLS-1$
+ return matcher;
}
public IFieldMatcher getArchRule() {
- return matcher; //$NON-NLS-1$
+ return matcher;
}
public IFieldMatcher getDescRule() {
- return matcher; //$NON-NLS-1$
+ return matcher;
}
}
15 years, 5 months
- 1
- 0