Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbateman2007-09-25 00:37:43 +0000
committercbateman2007-09-25 00:37:43 +0000
commitf1d1a6bf30fcbeb9900d47fe12622f3c29ab98ed (patch)
treefbc8aa243bdc7b497dda51c6d9192aaeb914ae23
parentf3dc95bbd2d45cbfdee5f31f119b38db510ca188 (diff)
downloadwebtools.jsf-f1d1a6bf30fcbeb9900d47fe12622f3c29ab98ed.tar.gz
webtools.jsf-f1d1a6bf30fcbeb9900d47fe12622f3c29ab98ed.tar.xz
webtools.jsf-f1d1a6bf30fcbeb9900d47fe12622f3c29ab98ed.zip
remove useless VARIABLE and METHOD parameters from ExpressionAction.
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java24
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java12
2 files changed, 7 insertions, 29 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java
index 78f1782fc..3204dca09 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java
@@ -40,15 +40,7 @@ public class ExpressionAction extends Action
private String _action;
private IProject _project;
private IFile _file;
- private int _type;
- /**
- * @param type
- */
- public ExpressionAction(int type)
- {
- _type = type;
- }
/**
* @param attribute
@@ -85,21 +77,7 @@ public class ExpressionAction extends Action
IPageVariablesProvider.class);
pageVarProvider.refresh();
- Object result = null;
- if (_type == METHOD)
- {
-// result = VariableResolverUtils.resolveMethodBinding(_action, _project, IWebFrameworkResolver.ACTION_METHOD, true);
- result = null;
- }
- else
- {
-// result = VariableResolverUtils.resolveValueBinding(_action, _project, true);
- result = null;
- }
- if (result == null)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", "Message.Warning.InvalidateExpression");//$NON-NLS-1$ $NON-NLS-2$
- }
+ JSFUIPlugin.getAlerts().warning("Message.Warning.Title", "Message.Warning.InvalidateExpression");//$NON-NLS-1$ $NON-NLS-2$
}
/**
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java
index 8f2e179e5..4d593e387 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java
@@ -69,11 +69,11 @@ public class JSFNavigationGroup
{
if (support.isActionSource())
{
- ExpressionAction action = new ExpressionAction(ExpressionAction.METHOD);
+ ExpressionAction action = new ExpressionAction();
action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Action"));//$NON-NLS-1$
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_ACTION));
if (ele != null)
{
+ action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_ACTION));
IDOMModel model = ele.getModel();
action.setProject(StructuredModelUtil.getProjectFor(model));
action.setFile(StructuredModelUtil.getFileFor(model));
@@ -82,11 +82,11 @@ public class JSFNavigationGroup
}
if (support.isValueHolder())
{
- ExpressionAction action = new ExpressionAction(ExpressionAction.VARIABLE);
+ ExpressionAction action = new ExpressionAction();
action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Value"));//$NON-NLS-1$
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_VALUE));
if (ele != null)
{
+ action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_VALUE));
IDOMModel model = ele.getModel();
action.setProject(StructuredModelUtil.getProjectFor(model));
action.setFile(StructuredModelUtil.getFileFor(model));
@@ -95,11 +95,11 @@ public class JSFNavigationGroup
}
{
- ExpressionAction action = new ExpressionAction(ExpressionAction.VARIABLE);
+ ExpressionAction action = new ExpressionAction();
action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Binding"));//$NON-NLS-1$
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_BINDING));
if (ele != null)
{
+ action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_BINDING));
IDOMModel model = ele.getModel();
action.setProject(StructuredModelUtil.getProjectFor(model));
action.setFile(StructuredModelUtil.getFileFor(model));

Back to the top