Author: tfennelly
Date: 2010-12-21 11:00:19 -0500 (Tue, 21 Dec 2010)
New Revision: 27643
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchShortcut.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-7782
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java 2010-12-21
15:22:59 UTC (rev 27642)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java 2010-12-21
16:00:19 UTC (rev 27643)
@@ -11,6 +11,7 @@
public static String SmooksLaunchConfigurationDelegate_Error_missing_artifact;
public static String SmooksLaunchConfigurationDelegate_Error_missing_artifact2;
public static String SmooksLaunchConfigurationDelegate_Error_Title;
+ public static String SmooksLaunchConfigurationDelegate_Error_Java_Unsupported;
public static String SmooksLauncher_Error_Do_Not_Support_Java_Inputs;
public static String SmooksLauncher_Templating_To_StreamResult;
public static String SmooksLauncher_Java_Mapping_Results;
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-12-21
15:22:59 UTC (rev 27642)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-12-21
16:00:19 UTC (rev 27643)
@@ -79,7 +79,10 @@
launchMetadata.setSmooksConfig(project.findMember(smooksConfigName));
- if(!launchMetadata.isValidSmooksConfig()) {
+ if(SmooksInputType.INPUT_TYPE_JAVA.equals(launchMetadata.getInputType())) {
+ displayError(smooksConfigName,
Messages.SmooksLaunchConfigurationDelegate_Error_Java_Unsupported);
+ return;
+ } else if(!launchMetadata.isValidSmooksConfig()) {
displayError(smooksConfigName, launchMetadata.getErrorMessage());
return;
} else {
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchShortcut.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchShortcut.java 2010-12-21
15:22:59 UTC (rev 27642)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchShortcut.java 2010-12-21
16:00:19 UTC (rev 27643)
@@ -29,6 +29,7 @@
import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.smooks.configuration.RuntimeMetadata;
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+import org.jboss.tools.smooks.core.SmooksInputType;
import org.jboss.tools.smooks.editor.AbstractSmooksFormEditor;
public class SmooksLaunchShortcut extends JUnitLaunchShortcut {
@@ -104,7 +105,10 @@
}
RuntimeMetadata metadata = new RuntimeMetadata();
metadata.setSmooksConfig(elementToLaunch);
- if (!metadata.isValidSmooksConfig()) {
+ if(SmooksInputType.INPUT_TYPE_JAVA.equals(metadata.getInputType())) {
+ MessageDialog.openError(getShell(),
Messages.SmooksLaunchShortcut_Title_Launch_Failed,
Messages.SmooksLaunchConfigurationDelegate_Error_Java_Unsupported);
+ return;
+ } else if (!metadata.isValidSmooksConfig()) {
MessageDialog.openError(getShell(),
Messages.SmooksLaunchShortcut_Title_Launch_Failed, metadata.getErrorMessage());
return;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties 2010-12-21
15:22:59 UTC (rev 27642)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties 2010-12-21
16:00:19 UTC (rev 27643)
@@ -5,6 +5,7 @@
SmooksLaunchConfigurationDelegate_Error_missing_artifact=This configuration depends on
the '
SmooksLaunchConfigurationDelegate_Error_missing_artifact2=' Smooks artifact.
Download Smooks and add the Smooks jars to the Project classpath, or update your Maven POM
to include the missing artifact.
SmooksLaunchConfigurationDelegate_Error_Title=Error
+SmooksLaunchConfigurationDelegate_Error_Java_Unsupported=Launching of Java Input Task
based configurations are not yet supported.
SmooksLauncher_Error_Do_Not_Support_Java_Inputs=Sorry... we don't support Java Inputs
yet.
SmooksLauncher_Templating_To_StreamResult=Stream Templating Result
SmooksLauncher_Java_Mapping_Results=Java Mapping Results