[jbosstools-commits] JBoss Tools SVN: r25456 - branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors.
Author: tfennelly
Date: 2010-10-04 11:43:57 -0400 (Mon, 04 Oct 2010)
New Revision: 25456
Modified:
branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
Log:
merging https://jira.jboss.org/browse/JBIDE-7232
Modified:
branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
===================================================================
---
branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-10-04
15:29:03 UTC (rev 25455)
+++
branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-10-04
15:43:57 UTC (rev 25456)
@@ -949,14 +949,14 @@
Object parentTask = taskType.getParent();
if(parentTask instanceof TaskType) {
- if(((TaskType) parentTask).getId().equals(TaskTypeManager.TASK_ID_INPUT)) {
+ if(((TaskType) parentTask).getId().equals(TaskTypeManager.TASK_ID_INPUT) &&
!taskType.getId().equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) {
for (AbstractSmooksGraphicalModel abstractSmooksGraphicalModel : children) {
if (abstractSmooksGraphicalModel instanceof InputDataContianerModel) {
createConnection(abstractSmooksGraphicalModel);
break;
}
}
- } else if(((TaskType)
parentTask).getId().equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) {
+ } else {
for (AbstractSmooksGraphicalModel abstractSmooksGraphicalModel : children) {
if (!(abstractSmooksGraphicalModel instanceof InputDataContianerModel)) {
if (canCreateConnection(abstractSmooksGraphicalModel)) {