Author: DartPeng Date: 2010-01-11 02:33:59 -0500 (Mon, 11 Jan 2010) New Revision: 19685 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java Removed: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java Log: JBIDE-5291 done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java 2010-01-11 07:10:54 UTC (rev 19684) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -10,7 +10,7 @@ import org.jboss.tools.smooks.gef.tree.model.TriggerConnection; import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection; import org.jboss.tools.smooks.graphical.editors.model.InputDataTreeNodeModel; -import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection; +import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerXMLNodeGraphicalModel; import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaBeanChildGraphModel; import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaBeanGraphModel; @@ -45,7 +45,7 @@ } if(target instanceof FreemarkerXMLNodeGraphicalModel){ - connection = new CSVLinkConnection(); + connection = new FreemarkerTemplateConnection(); connection.setSourceNode(source); connection.setTargetNode(target); } Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java 2010-01-11 07:10:54 UTC (rev 19684) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.graphical.editors.editparts.freemarker; - -import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; -import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; -import org.jboss.tools.smooks.configuration.editors.xml.TagObject; -import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; -import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart; -import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; -import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerModelAnalyzer; - -/** - * @author Dart - * - */ -public class CSVLinkConnectionEditPart extends TreeNodeConnectionEditPart { - - public CSVLinkConnectionEditPart() { - super(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals() - */ - @Override - protected void refreshVisuals() { - TreeNodeConnection connection = (TreeNodeConnection) this.getModel(); - AbstractSmooksGraphicalModel target = connection.getTargetNode(); - Object data = target.getData(); - if (data instanceof TagObject) { - if (FreemarkerModelAnalyzer.isChoiceElement(((TagObject) data).getReferenceElement())) { - this.setMarkerImage(SmooksConfigurationActivator.getDefault().getImageRegistry().get( - GraphicsConstants.IMAGE_XSL_CHOICE)); - } - } - super.refreshVisuals(); - } -} Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java (from rev 19679, trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java) =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -0,0 +1,49 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.graphical.editors.editparts.freemarker; + +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; +import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; +import org.jboss.tools.smooks.configuration.editors.xml.TagObject; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; +import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerModelAnalyzer; + +/** + * @author Dart + * + */ +public class FreemarkerTemplateConnectionEditPart extends TreeNodeConnectionEditPart { + + public FreemarkerTemplateConnectionEditPart() { + super(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals() + */ + @Override + protected void refreshVisuals() { + TreeNodeConnection connection = (TreeNodeConnection) this.getModel(); + AbstractSmooksGraphicalModel target = connection.getTargetNode(); + Object data = target.getData(); + if (data instanceof TagObject) { + if (FreemarkerModelAnalyzer.isChoiceElement(((TagObject) data).getReferenceElement())) { + this.setMarkerImage(SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_XSL_CHOICE)); + } + } + super.refreshVisuals(); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java 2010-01-11 07:10:54 UTC (rev 19684) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.graphical.editors.model.freemarker; - -import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; - -/** - * @author Dart - * - */ -public class CSVLinkConnection extends TreeNodeConnection { - -} Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java (from rev 19679, trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java) =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.graphical.editors.model.freemarker; + +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; + +/** + * @author Dart + * + */ +public class FreemarkerTemplateConnection extends TreeNodeConnection { + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-01-11 07:10:54 UTC (rev 19684) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -27,7 +27,7 @@ import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.graphical.editors.IGraphicalEditorPart; import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigChildNodeGraphModel; -import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection; +import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateNodeGraphicalModel; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateXMLModel; @@ -70,7 +70,7 @@ } } if (data instanceof org.jboss.tools.smooks.model.javabean12.ValueType - || connectionType == CSVLinkConnection.class) { + || connectionType == FreemarkerTemplateConnection.class) { return true; } // if (connectionType == ValueBindingConnection.class) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java 2010-01-11 07:10:54 UTC (rev 19684) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -29,7 +29,7 @@ import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.graphical.editors.ConnectionModelFactoryImpl; import org.jboss.tools.smooks.graphical.editors.editparts.SmooksGraphUtil; -import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection; +import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateNodeGraphicalModel; import org.jboss.tools.smooks.model.freemarker.Freemarker; @@ -151,7 +151,7 @@ } if (sourceNode != null && targetNode != null) { - TreeNodeConnection connection = new CSVLinkConnection(); + TreeNodeConnection connection = new FreemarkerTemplateConnection(); connection.setSourceNode(sourceNode); connection.setTargetNode(targetNode); connection.connectSource(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java 2010-01-11 07:10:54 UTC (rev 19684) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java 2010-01-11 07:33:59 UTC (rev 19685) @@ -12,10 +12,10 @@ import org.eclipse.gef.EditPart; import org.jboss.tools.smooks.graphical.editors.SmooksEditFactory; -import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.CSVLinkConnectionEditPart; +import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.FreemarkerTemplateConnectionEditPart; import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.FreemarkerCSVNodeEditPart; import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.FreemarkerXMLNodeEditPart; -import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection; +import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerCSVNodeGraphicalModel; import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerXMLNodeGraphicalModel; @@ -33,8 +33,8 @@ editPart = new FreemarkerXMLNodeEditPart(); } - if (model instanceof CSVLinkConnection) { - editPart = new CSVLinkConnectionEditPart(); + if (model instanceof FreemarkerTemplateConnection) { + editPart = new FreemarkerTemplateConnectionEditPart(); } if (editPart == null) {