1 files changed, 14 insertions, 0 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/PropertyTester.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/PropertyTester.java
index 6f8121349..f64dc482d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/PropertyTester.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/PropertyTester.java
@@ -11,8 +11,11 @@ package org.eclipse.tcf.te.tcf.ui.internal;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
+import org.eclipse.tcf.te.tcf.locator.utils.SimulatorUtils;
 import org.eclipse.tcf.te.tcf.ui.handler.DeleteHandler;
 import org.eclipse.tcf.te.tcf.ui.handler.OfflineCommandHandler;
+import org.eclipse.tcf.te.ui.views.navigator.nodes.NewWizardNode;
 
 
 
@@ -34,6 +37,17 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester
 			// Analyze the selection
 			return testSelection((IStructuredSelection)receiver, property, args, expectedValue);
 		}
+
+		if ("isWizardId".equals(property) && receiver instanceof NewWizardNode) { //$NON-NLS-1$
+			return ((NewWizardNode)receiver).getWizardId().equals(expectedValue);
+		}
+
+		if ("isValidSimulatorConfig".equals(property) && receiver instanceof IPeerModel && expectedValue instanceof Boolean) { //$NON-NLS-1$
+			SimulatorUtils.Result simulator = SimulatorUtils.getSimulatorService((IPeerModel)receiver);
+			boolean valid = simulator != null && simulator.service.isValidConfig(receiver, simulator.settings);
+			return ((Boolean)expectedValue).booleanValue() == valid;
+		}
+
 		return false;
 	}