bug fix 148071: From-Outcome browser from Link property sheet always displays empty list
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
index 90e70c8..c8cee09 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
@@ -24,8 +24,8 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
@@ -195,21 +195,13 @@
actionCol
.setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Action);//$NON-NLS-1$
- actionTable.addSelectionListener(new SelectionListener() {
-
+ actionTable.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
TableItem selItem = (TableItem) e.item;
String action = selItem.getText(1);
- if (action != null && action.length() > 0) {
+ if (action != null && action.length() > 0)
actionText.setText(action);
- }
}
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // TODO Auto-generated method stub
-
- }
-
});
addActionsInJSP();
@@ -306,7 +298,7 @@
* @return
*/
private boolean isValidName() {
- return (actionText.getText().length() > 0);
+ return actionText.getText().length() > 0;
}
/**
@@ -326,33 +318,29 @@
List actionNodes = JSPUtil.getActionListInJSPFile(jspName);
if (actionNodes != null) {
- for (int i = 0; i < actionNodes.size(); i++) {
+ for (int i = 0, n = actionNodes.size(); i < n; i++) {
Element node = (Element) actionNodes.get(i);
+ StringBuffer componentName = new StringBuffer();
- String tagName = node.getTagName();
Attr idAttr = node.getAttributeNode("id");
- String id = "";
- if (idAttr != null) {
- id = idAttr.getNodeValue(); //$NON-NLS-1$
- }
+ if (idAttr != null)
+ componentName.append(idAttr.getNodeValue());
- String componentName = id + "(" + tagName + ")"; //$NON-NLS-1$
+ componentName.append("(").append(node.getTagName()).append(")"); //$NON-NLS-1$
+
Attr actionAttr = node.getAttributeNode("action");
- String action = "";
if (actionAttr != null) {
- action = actionAttr.getValue();
- if (!isValidEL(action)) {
- addActionTableItem(componentName, action);
- }
+ String action = actionAttr.getValue();
+ if (isValidEL(action))
+ addActionTableItem(componentName.toString(), action);
}
}
}
}
public static boolean isValidEL(String expressionString) {
- if (expressionString == null || expressionString.length() == 0) {
+ if (expressionString == null || expressionString.length() == 0)
return true;
- }
return expressionString.startsWith(JSF_EL_LEFT_BRACE)
&& expressionString.endsWith(JSF_EL_RIGHT_BRACE);
@@ -373,7 +361,5 @@
item.setText(0, componentName);
item.setText(1, action);
}
-
}
-
}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
index 527e7c3..dbd2151 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
@@ -69,9 +69,9 @@
List trackers = m.getTaglibTrackers();
for (Iterator iter = trackers.iterator(); iter.hasNext();) {
TaglibTracker tracker = (TaglibTracker) iter.next();
- if (uri.equals(tracker.getURI())) {
+ if (uri.equals(tracker.getURI()))
return tracker.getPrefix();
- } else {
+ else {
CMDocument cmdoc = tracker.getDocument();
if (cmdoc instanceof TLDDocument
&& uri.equals(((TLDDocument) cmdoc).getUri())) {
@@ -122,15 +122,15 @@
TaglibTracker tracker = (TaglibTracker) iter.next();
if (prefix.equals(tracker.getPrefix())) {
CMDocument cmdoc = tracker.getDocument();
- if (cmdoc instanceof TLDDocument) {
+ if (cmdoc instanceof TLDDocument)
return ((TLDDocument) cmdoc).getUri();
- } else
+ else
return null;
}
}
return null;
}
-
+
/**
* get the action list in the jsp file
*
@@ -160,16 +160,14 @@
// get the command butonns
List buttonActions = jspAdapter.getElementsByTagNameNS(
prefix, "commandButton");//$NON-NLS-1$
- if (buttonActions != null) {
+ if (buttonActions != null)
actions.addAll(buttonActions);
- }
// get the command links
List linkActions = jspAdapter.getElementsByTagNameNS(
prefix, "commandLink");//$NON-NLS-1$
- if (linkActions != null) {
+ if (linkActions != null)
actions.addAll(linkActions);
- }
}
}
}
