October 2009 - jbosstools-commits

JBoss Tools SVN: r18249 - workspace/examples.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2009-10-23 03:25:18 -0400 (Fri, 23 Oct 2009) New Revision: 18249 Modified: workspace/examples/project-examples-3.0.xml Log: JBIDE-4016:Small mistakes in ESB Examples Modified: workspace/examples/project-examples-3.0.xml =================================================================== --- workspace/examples/project-examples-3.0.xml 2009-10-23 06:55:50 UTC (rev 18248) +++ workspace/examples/project-examples-3.0.xml 2009-10-23 07:25:18 UTC (rev 18249) @@ -215,8 +215,7 @@ <name>helloworld_action</name> <shortDescription>JBoss ESB HelloWorld Action Example - ESB</shortDescription> - <description>This sample is to demonstrate the use of multiple action invocations from a single configuration. You can use - a single Action class and make multiple method calls or use multiple Action + <description>This example is to demonstrate the use of multiple action invocations from a single configuration. You can use a single Action class and make multiple method calls or use multiple Action classes.</description> <size>7100</size> <url> @@ -229,7 +228,7 @@ <category>ESB</category> <name>helloworld_action_client</name> <shortDescription>JBoss ESB HelloWorld Action Example - Client</shortDescription> - <description>This sample is to test the deployed helloworld_action ESB. It requires the helloworld_action project</description> + <description>This example is to test the deployed helloworld_action ESB. It requires the helloworld_action project.</description> <size>18694</size> <url> @@ -256,7 +255,7 @@ <name>helloworld_file_action_client</name> <shortDescription>JBoss ESB HelloWorld File Action Example - Client</shortDescription> - <description>This sample is to test the deployed helloworld_file_action ESB. It requires the helloworld_file_action project.</description> + <description>This example is to test the deployed helloworld_file_action ESB. It requires the helloworld_file_action project.</description> <size>18694</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel... @@ -269,8 +268,8 @@ <shortDescription>JBoss ESB Web Service consumer1 Example</shortDescription> <description>This example demonstrates how to consume a 181 Web Service in an ESB action. This ESB will make a webservice request that requires a single "toWhom" string parameter. - The webservice will return a greeting response. The ESB simply dislays the response on the - console.</description> + The webservice will return a greeting response. The ESB simply displays the response on the console. + </description> <size>22500</size> <url> @@ -283,7 +282,7 @@ <name>webservice_consumer1_client</name> <shortDescription>JBoss ESB Web Service consumer1 Example - Client</shortDescription> - <description>This sample is to test the deployed a comsumer web service.It requires the webservice_consumer1 project.</description> + <description>This example is to test the deployed a consumer web service.It requires the webservice_consumer1 project.</description> <size>1000000</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/webs... @@ -322,9 +321,7 @@ <shortDescription>JBoss ESB Smooks CSV->XML Example</shortDescription> <description>This sample demonstrates how to transform a comma separated value (CSV) file to an xml. - The tranformation is done by configuring Smooks and performing two transformation, one - transformation from CSV to an intermediate xml format, and a second transformation from - the intermediate xml format to the target xml.</description> + The tranformation is done by configuring Smooks and performing two transformation, one transformation from CSV to an intermediate xml format, and a second transformation from the intermediate xml format to the target xml.</description> <size>7200</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/tran...

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18248 - in trunk/smooks: plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12 and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-10-23 02:55:50 -0400 (Fri, 23 Oct 2009) New Revision: 18248 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIReader12DataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/ediparser/EDIParserTest.java Log: JBIDE-5074 Done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2009-10-23 02:06:18 UTC (rev 18247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2009-10-23 06:55:50 UTC (rev 18248) @@ -54,6 +54,7 @@ import org.eclipse.jface.viewers.ITableColorProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -83,7 +84,9 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.ide.IDE; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.configuration.editors.wizard.IStructuredDataSelectionWizard; import org.jboss.tools.smooks.configuration.editors.wizard.StructuredDataSelectionWizard; +import org.jboss.tools.smooks.configuration.editors.wizard.ViewerInitorStore; import org.jboss.tools.smooks.configuration.validate.ISmooksModelValidateListener; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.editor.ISourceSynchronizeListener; @@ -537,7 +540,7 @@ deactiveAllInputFile(compoundCommand); if (!compoundCommand.isEmpty()) { getEditingDomain().getCommandStack().execute(compoundCommand); - if(reader != null && reader instanceof EObject){ + if (reader != null && reader instanceof EObject) { createReaderPanel(((EObject) reader)); } } @@ -820,8 +823,8 @@ IJavaProject javaProject = JavaCore.create(file.getProject()); if (javaProject != null) { try { - if(filePath.endsWith("[]")){ - filePath = filePath.substring(0,filePath.length() - 2); + if (filePath.endsWith("[]")) { + filePath = filePath.substring(0, filePath.length() - 2); } IJavaElement result = javaProject.findType(filePath); if (result != null) @@ -950,19 +953,40 @@ } protected void showInputDataWizard() { - StructuredDataSelectionWizard wizard = new StructuredDataSelectionWizard(); - wizard.setInput(getEditorInput()); - wizard.setSite(getEditorSite()); - wizard.setForcePreviousAndNextButtons(true); - StructuredDataSelectionWizardDailog dialog = new StructuredDataSelectionWizardDailog( - getEditorSite().getShell(), wizard, getSmooksGraphicsExtType()); - if (dialog.show() == Dialog.OK) { - SmooksGraphicsExtType extType = getSmooksGraphicsExtType(); - String type = dialog.getType(); - String path = dialog.getPath(); - Properties pros = dialog.getProperties(); - SmooksUIUtils.recordInputDataInfomation(getEditingDomain(), null, extType, type, path, pros); + + SmooksGraphicsExtType extType = getSmooksGraphicsExtType(); + String inputType = extType.getInputType(); + List<InputType> inputTypes = null; + if (inputType == null || SmooksModelUtils.INPUT_TYPE_CUSTOME.equals(inputType) || inputType.trim().equals("")) { + StructuredDataSelectionWizard wizard = new StructuredDataSelectionWizard(); + wizard.setInput(getEditorInput()); + wizard.setSite(getEditorSite()); + wizard.setForcePreviousAndNextButtons(true); + StructuredDataSelectionWizardDailog dialog = new StructuredDataSelectionWizardDailog(getEditorSite() + .getShell(), wizard, getSmooksGraphicsExtType()); + + if (dialog.show() == Dialog.OK) { + String type = dialog.getType(); + String path = dialog.getPath(); + Properties pros = dialog.getProperties(); + inputTypes = SmooksUIUtils.recordInputDataInfomation(getEditingDomain(), null, extType, type, path, pros); + } + } else { + IStructuredDataSelectionWizard wizard = ViewerInitorStore.getInstance().getStructuredDataCreationWizard( + inputType); + WizardDialog dialog = new WizardDialog(getEditorSite().getShell(), wizard); + wizard.init(getEditorSite(), getEditorInput()); + if (dialog.open() == Dialog.OK) { + String path = wizard.getStructuredDataSourcePath(); + Properties pros = wizard.getProperties(); + inputTypes = SmooksUIUtils.recordInputDataInfomation(getEditingDomain(), null, extType, inputType, path, pros); + } } + + if(inputTypes != null && !inputTypes.isEmpty()){ + deactiveAllInputFile(null); + setInputDataActiveStatus(true, inputTypes.get(0), null); + } } private void refreshInputModelView() { @@ -974,8 +998,8 @@ } public void inputTypeChanged(SmooksGraphicsExtType extType) { - if (inputDataViewer != null) - inputDataViewer.refresh(); +// if (inputDataViewer != null) +// inputDataViewer.refresh(); refreshInputModelView(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIReader12DataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIReader12DataWizard.java 2009-10-23 02:06:18 UTC (rev 18247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader12/EDIReader12DataWizard.java 2009-10-23 06:55:50 UTC (rev 18248) @@ -35,6 +35,7 @@ import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** + * @deprecated * @author Dart * */ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java 2009-10-23 02:06:18 UTC (rev 18247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json12/Json12DataWizard.java 2009-10-23 06:55:50 UTC (rev 18248) @@ -40,6 +40,7 @@ import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** + * @deprecated * @author Dart (dpeng(a)redhat.com) * */ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-10-23 02:06:18 UTC (rev 18247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-10-23 06:55:50 UTC (rev 18248) @@ -889,9 +889,10 @@ }); } -// boolean valueIsSet = true; + // boolean valueIsSet = true; if (model != null && model instanceof EObject && itemPropertyDescriptor != null) { -// valueIsSet = ((EObject) model).eIsSet((EAttribute) itemPropertyDescriptor.getFeature(model)); + // valueIsSet = ((EObject) model).eIsSet((EAttribute) + // itemPropertyDescriptor.getFeature(model)); } if (editValue != null) { valueText.setText(editValue); @@ -1215,8 +1216,8 @@ if (fresource.getProject().hasNature(JavaCore.NATURE_ID)) { IJavaProject javaProject = JavaCore.create(fresource.getProject()); String typeName = searchComposite.getText().getText(); - if(typeName.endsWith("[]")){ - typeName = typeName.substring(0,typeName.length() - 2); + if (typeName.endsWith("[]")) { + typeName = typeName.substring(0, typeName.length() - 2); } IJavaElement result = javaProject.findType(typeName); if (result != null) @@ -1412,8 +1413,8 @@ } public static SmooksResourceListType getSmooks11ResourceListType(EObject model) { - if(model instanceof org.jboss.tools.smooks.model.smooks.DocumentRoot){ - return ((org.jboss.tools.smooks.model.smooks.DocumentRoot)model).getSmooksResourceList(); + if (model instanceof org.jboss.tools.smooks.model.smooks.DocumentRoot) { + return ((org.jboss.tools.smooks.model.smooks.DocumentRoot) model).getSmooksResourceList(); } if (model instanceof SmooksResourceListType) return (SmooksResourceListType) model; @@ -2439,8 +2440,9 @@ return false; } - public static void recordInputDataInfomation(EditingDomain domain, InputType input, SmooksGraphicsExtType extType, + public static List<InputType> recordInputDataInfomation(EditingDomain domain, InputType input, SmooksGraphicsExtType extType, String type, String path, Properties properties) { + List<InputType> inputTypeList = new ArrayList<InputType>(); if (type != null && path != null && extType != null && domain != null) { String[] values = path.split(";"); if (values == null || values.length == 0) { @@ -2475,7 +2477,10 @@ input.getParam().addAll(params); Command command = AddCommand.create(domain, extType, GraphPackage.Literals.SMOOKS_GRAPHICS_EXT_TYPE__INPUT, input); - domain.getCommandStack().execute(command); + if (command.canExecute()) { + domain.getCommandStack().execute(command); + inputTypeList.add(input); + } // extType.getInput().add(input); } // try { @@ -2489,6 +2494,8 @@ // SmooksConfigurationActivator.getDefault().log(e); // } } + + return inputTypeList; } public static void expandGraphTree(List<?> expandNodes, TreeNodeEditPart rootEditPart) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2009-10-23 02:06:18 UTC (rev 18247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2009-10-23 06:55:50 UTC (rev 18248) @@ -191,6 +191,10 @@ hookBrowseButtonSelectionAdapter(); hookFileTextModifyListener(); this.setControl(mainComposite); + + changeWizardPageStatus(); + // don't show the error message when first open the dialog + this.setErrorMessage(null); } protected void hookFileTextModifyListener() { @@ -361,7 +365,7 @@ gd.grabExcessHorizontalSpace = true; gd.horizontalAlignment = GridData.END; fileSystemBrowseButton.setLayoutData(gd); - changeWizardPageStatus(); + return xsdComposite; } Modified: trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/ediparser/EDIParserTest.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/ediparser/EDIParserTest.java 2009-10-23 02:06:18 UTC (rev 18247) +++ trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/ediparser/EDIParserTest.java 2009-10-23 06:55:50 UTC (rev 18248) @@ -28,6 +28,7 @@ import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; import org.jboss.tools.smooks.model.smooks.util.SmooksResourceFactoryImpl; import org.jboss.tools.smooks.test.model11.BaseTestCase; +import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart (dpeng(a)redhat.com) @@ -36,27 +37,24 @@ public class EDIParserTest extends BaseTestCase { public void testEDIParser() throws IOException, DocumentException, ParserConfigurationException { - + Resource smooksResource = new SmooksResourceFactoryImpl().createResource(null); - - - smooksResource.load(EDIParserTest.class.getResourceAsStream("smooks-config.xml"), null); SmooksResourceListType resourceList = ((org.jboss.tools.smooks.model.smooks.DocumentRoot) smooksResource .getContents().get(0)).getSmooksResourceList(); assertNotNull(resourceList); - + SmooksGraphicsExtType extType = getSmooksGraphExtType(resourceList); - + assertNotNull(extType); InputType inputType = null; List<?> ilist = extType.getInput(); for (Iterator<?> iterator = ilist.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); if (object instanceof InputType) { - if ("EDI".equalsIgnoreCase(((InputType) object).getType())) { + if (SmooksModelUtils.INPUT_TYPE_EDI_1_1.equalsIgnoreCase(((InputType) object).getType())) { inputType = (InputType) object; break; } @@ -65,7 +63,8 @@ assertNotNull(inputType); EDIDataParser parser = new EDIDataParser(); - TagList tagList = parser.parseEDIFile(EDIParserTest.class.getResourceAsStream("input-message.edi"), inputType,resourceList); + TagList tagList = parser.parseEDIFile(EDIParserTest.class.getResourceAsStream("input-message.edi"), inputType, + resourceList); assertNotNull(tagList); List<String> namesList = new ArrayList<String>(); namesList.add("Orderaaa"); @@ -74,7 +73,8 @@ for (Iterator<?> iterator = ilist.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); if (object instanceof InputType) { - if ("EDI".equalsIgnoreCase(((InputType) object).getType()) && object != inputType) { + if (SmooksModelUtils.INPUT_TYPE_EDI_1_1.equalsIgnoreCase(((InputType) object).getType()) + && object != inputType) { inputType = (InputType) object; break; }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18247 - in trunk/jbpm/releng: org.jboss.tools.jbpm4.releng and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-10-22 22:06:18 -0400 (Thu, 22 Oct 2009) New Revision: 18247 Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties Log: switch back to 32 Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-10-23 01:31:54 UTC (rev 18246) +++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-10-23 02:06:18 UTC (rev 18247) @@ -25,7 +25,8 @@ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ -http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz +#http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz flattenDependencies=true parallelCompilation=true Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 01:31:54 UTC (rev 18246) +++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 02:06:18 UTC (rev 18247) @@ -25,7 +25,8 @@ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ -http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz +#http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz flattenDependencies=true parallelCompilation=true

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18246 - in trunk/jbpm/releng: org.jboss.tools.jbpm4.releng/maps and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-10-22 21:31:54 -0400 (Thu, 22 Oct 2009) New Revision: 18246 Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/common.map trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map Log: moved? refactored? whatever... common test plugin in tests/ instead of plugins/ Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/common.map =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/common.map 2009-10-23 01:22:00 UTC (rev 18245) +++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/common.map 2009-10-23 01:31:54 UTC (rev 18246) @@ -7,4 +7,4 @@ plugin@org.jboss.tools.jbpm.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common !*** test plugins -plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common.test +plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.jbpm.common.test \ No newline at end of file Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map 2009-10-23 01:22:00 UTC (rev 18245) +++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map 2009-10-23 01:31:54 UTC (rev 18246) @@ -7,4 +7,4 @@ plugin@org.jboss.tools.jbpm.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common !*** test plugins -plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common.test +plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.jbpm.common.test \ No newline at end of file

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18245 - in trunk/jbpm/releng: org.jboss.tools.jbpm4.releng/maps and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-10-22 21:22:00 -0400 (Thu, 22 Oct 2009) New Revision: 18245 Added: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/test.map trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/test.map Log: add ETF map entries Added: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/test.map =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/test.map (rev 0) +++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/test.map 2009-10-23 01:22:00 UTC (rev 18245) @@ -0,0 +1,2 @@ +plugin@org.eclipse.test=v20080313,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, +fragment@org.eclipse.ant.optional.junit=v20070202,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, Property changes on: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/maps/test.map ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/test.map =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/test.map (rev 0) +++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/test.map 2009-10-23 01:22:00 UTC (rev 18245) @@ -0,0 +1,2 @@ +plugin@org.eclipse.test=v20080313,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, +fragment@org.eclipse.ant.optional.junit=v20070202,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, Property changes on: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/test.map ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18244 - in trunk/jbpm/releng: org.jboss.tools.jbpm4.releng and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-10-22 21:19:51 -0400 (Thu, 22 Oct 2009) New Revision: 18244 Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... Log: switch to 64-bit builder Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-10-23 01:12:22 UTC (rev 18243) +++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-10-23 01:19:51 UTC (rev 18244) @@ -25,7 +25,7 @@ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ -http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz flattenDependencies=true parallelCompilation=true Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... 2009-10-23 01:12:22 UTC (rev 18243) +++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... 2009-10-23 01:19:51 UTC (rev 18244) @@ -25,7 +25,7 @@ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ -http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz flattenDependencies=true parallelCompilation=true Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 01:12:22 UTC (rev 18243) +++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 01:19:51 UTC (rev 18244) @@ -25,7 +25,7 @@ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ -http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz flattenDependencies=true parallelCompilation=true Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... 2009-10-23 01:12:22 UTC (rev 18243) +++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... 2009-10-23 01:19:51 UTC (rev 18244) @@ -25,7 +25,7 @@ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ -http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz flattenDependencies=true parallelCompilation=true

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18243 - in trunk/jbpm/releng: org.jboss.tools.jbpm4.releng and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-10-22 21:12:22 -0400 (Thu, 22 Oct 2009) New Revision: 18243 Added: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties Log: jboss qa hudson config Modified: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-10-23 00:26:45 UTC (rev 18242) +++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties 2009-10-23 01:12:22 UTC (rev 18243) @@ -14,17 +14,12 @@ build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -# Re-use local sources? -localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm -relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm3.releng -relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder -relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng +# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables +JAVA_HOME=${JAVA_HOME_PARENT} +JAVA14_HOME=${JAVA_HOME_PARENT} +JAVA50_HOME=${JAVA_HOME_PARENT} +JAVA60_HOME=${JAVA_HOME_PARENT} -JAVA_HOME=/usr/lib/jvm/java -JAVA14_HOME=/usr/lib/jvm/java -JAVA50_HOME=/usr/lib/jvm/java -JAVA60_HOME=/usr/lib/jvm/java - dependencyURLs=\ http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ @@ -37,13 +32,12 @@ generateFeatureVersionSuffix=true individualSourceBundles=true +# do not sign or pack jars +#skipPack=true +skipSign=true + domainNamespace=* projNamespace=org.jboss.tools.jbpm3 projRelengName=org.jboss.tools.jbpm3.releng -# needed for Hudson, not for local? -#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx -#projRelengPath=releng -#basebuilderBranch=R35_M6 - ## END PROJECT BUILD PROPERTIES ## Added: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... (rev 0) +++ trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... 2009-10-23 01:12:22 UTC (rev 18243) @@ -0,0 +1,43 @@ +## BEGIN PROJECT BUILD PROPERTIES ## + +# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you +thirdPartyDownloadLicenseAcceptance="I accept" + +projectid=jbosstools.jbpm3 +zipPrefix=jbpm3 +incubation= +buildType=N +version=3.2.0 + +mainFeatureToBuildID=org.jboss.tools.jbpm3.sdk.feature +testFeatureToBuildID=org.jboss.tools.jbpm3.tests.feature + +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup + +# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables +JAVA_HOME=${JAVA_HOME_PARENT} +JAVA14_HOME=${JAVA_HOME_PARENT} +JAVA50_HOME=${JAVA_HOME_PARENT} +JAVA60_HOME=${JAVA_HOME_PARENT} + +dependencyURLs=\ +http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\ +http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz + +flattenDependencies=true +parallelCompilation=true +generateFeatureVersionSuffix=true +individualSourceBundles=true + +# do not sign or pack jars +#skipPack=true +skipSign=true + +domainNamespace=* +projNamespace=org.jboss.tools.jbpm3 +projRelengName=org.jboss.tools.jbpm3.releng + +## END PROJECT BUILD PROPERTIES ## Property changes on: trunk/jbpm/releng/org.jboss.tools.jbpm3.releng/build.properties.example.h... ___________________________________________________________________ Name: svn:executable + * Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 00:26:45 UTC (rev 18242) +++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties 2009-10-23 01:12:22 UTC (rev 18243) @@ -14,18 +14,12 @@ build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -# If using local sources, must copy or symlink jbosstools-trunk/flow/* into jbosstools-trunk/jbpm/ to find all plugins/features -localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm +# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables +JAVA_HOME=${JAVA_HOME_PARENT} +JAVA14_HOME=${JAVA_HOME_PARENT} +JAVA50_HOME=${JAVA_HOME_PARENT} +JAVA60_HOME=${JAVA_HOME_PARENT} -relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm4.releng -relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder -relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng - -JAVA_HOME=/usr/lib/jvm/java -JAVA14_HOME=/usr/lib/jvm/java -JAVA50_HOME=/usr/lib/jvm/java -JAVA60_HOME=/usr/lib/jvm/java - dependencyURLs=\ http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\ http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ @@ -38,13 +32,12 @@ generateFeatureVersionSuffix=true individualSourceBundles=true +# do not sign or pack jars +#skipPack=true +skipSign=true + domainNamespace=* projNamespace=org.jboss.tools.jbpm4 projRelengName=org.jboss.tools.jbpm4.releng -# needed for Hudson, not for local? -#projRelengRoot=svn://svn.jboss.org/repos/jbosstools/trunk/jmx -#projRelengPath=releng -#basebuilderBranch=R35_M6 - ## END PROJECT BUILD PROPERTIES ## Added: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... =================================================================== --- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... (rev 0) +++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... 2009-10-23 01:12:22 UTC (rev 18243) @@ -0,0 +1,43 @@ +## BEGIN PROJECT BUILD PROPERTIES ## + +# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you +thirdPartyDownloadLicenseAcceptance="I accept" + +projectid=jbosstools.jbpm4 +zipPrefix=jbpm4 +incubation= +buildType=N +version=4.0.0 + +mainFeatureToBuildID=org.jboss.tools.jbpm4.sdk.feature +testFeatureToBuildID=org.jboss.tools.jbpm4.tests.feature + +build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup + +# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables +JAVA_HOME=${JAVA_HOME_PARENT} +JAVA14_HOME=${JAVA_HOME_PARENT} +JAVA50_HOME=${JAVA_HOME_PARENT} +JAVA60_HOME=${JAVA_HOME_PARENT} + +dependencyURLs=\ +http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\ +http://repository.jboss.org/eclipse/galileo/emf-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/xsd-runtime-2.5.0.zip,\ +http://repository.jboss.org/eclipse/galileo/wtp-R-3.1.1-20090917225226.zip,\ +http://repository.jboss.org/eclipse/galileo/eclipse-SDK-3.5.1-linux-gtk.tar.gz + +flattenDependencies=true +parallelCompilation=true +generateFeatureVersionSuffix=true +individualSourceBundles=true + +# do not sign or pack jars +#skipPack=true +skipSign=true + +domainNamespace=* +projNamespace=org.jboss.tools.jbpm4 +projRelengName=org.jboss.tools.jbpm4.releng + +## END PROJECT BUILD PROPERTIES ## Property changes on: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.properties.example.h... ___________________________________________________________________ Name: svn:executable + *

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18242 - in trunk/common: releng and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-10-22 20:26:45 -0400 (Thu, 22 Oct 2009) New Revision: 18242 Added: trunk/common/releng/ trunk/common/releng/hudson/ trunk/common/releng/hudson/run.sh Log: common hudson run.sh script copied from pi4soa build Added: trunk/common/releng/hudson/run.sh =================================================================== --- trunk/common/releng/hudson/run.sh (rev 0) +++ trunk/common/releng/hudson/run.sh 2009-10-23 00:26:45 UTC (rev 18242) @@ -0,0 +1,208 @@ +#!/bin/bash + +# This script runs as http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-*/con... +# and is archived (for example) in https://pi4soa.svn.sourceforge.net/svnroot/pi4soa/trunk/releng/hudson/run.sh +# Build runs under ${WORKSPACE} == .../jbosstools-cbi-*/workspace + +############################################################################################## + +# BEGIN CONFIGURATION + +buildTimestamp="`date +%Y%m%d%H%M`" +commonRelengBranch="HEAD" +basebuilderBranch="r35x_v20090811"; +cvsProjectBaseDir=${WORKSPACE} # hudson.qa.jboss.com + +# DONE CONFIGURATION + +############################################################################################## + +echo "[`date +%Y/%m/%d\ %H:%M`] Hudson job ${JOBNAME} build #${BUILD_NUMBER} (${BUILD_ID}) started." + +uname -a +if [[ -f $HUDSON_CONFIG_DIR/scripts/common/common_bash.sh ]]; then + . $HUDSON_CONFIG_DIR/scripts/common/common_bash.sh + setant 171 +elif [[ -f /opt/hudson/tools/apache-ant-1.7.1/bin/ant ]]; then + export ANT_HOME=/opt/hudson/tools/apache-ant-1.7.1 +elif [[ -f /opt/apache-ant-1.7.1/bin/ant ]]; then + export ANT_HOME=/opt/apache-ant-1.7.1 +fi + +export JAVA14 +export JAVA15 +export JAVA16 + +# cache of downloaded requirements and other binaries +downloadsDir="${WORKSPACE}/downloads"; if [[ ! -d $downloadsDir ]]; then mkdir -p $downloadsDir; fi + +# define where to do all the work; start with a fresh folder each time +writableBuildRoot="${WORKSPACE}/build"; if [[ -d ${writableBuildRoot} ]]; then rm -fr ${writableBuildRoot}; fi; mkdir -p $writableBuildRoot + +# need a place to store existing 3rd party jars, eg., ant-contrib.jar (if not in /usr/share/java/) +thirdPartyJarsDir="${WORKSPACE}/3rdPartyJars"; if [[ ! -d $thirdPartyJarsDir ]]; then mkdir -p $thirdPartyJarsDir; fi + +# get org.eclipse.dash.common.releng +if [[ ! -d $cvsProjectBaseDir/org.eclipse.dash.common.releng ]]; then + cd $cvsProjectBaseDir + echo "Check out org.eclipse.dash.common.releng using HEAD" + cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/technology -Q co -r $commonRelengBranch -d org.eclipse.dash.common.releng org.eclipse.dash/athena/org.eclipse.dash.commonbuilder/org.eclipse.dash.commonbuilder.releng +fi + +# get org.eclipse.releng.basebuilder +if [[ ! -d $cvsProjectBaseDir/org.eclipse.releng.basebuilder ]]; then + # network timeout when checking out files + #echo "Export org.eclipse.releng.basebuilder using $basebuilderBranch" + #cd $cvsProjectBaseDir; cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse -Q ex -r $basebuilderBranch org.eclipse.releng.basebuilder + + #so get a zip and unpack it instead; zip stored here: http://anonsvn.jboss.org/repos/repository.jboss.org/eclipse/galileo/org.e... + if [[ ! -f $downloadsDir/org.eclipse.releng.basebuilder_${basebuilderBranch}.zip ]]; then + cd $downloadsDir; wget --no-clobber http://repository.jboss.org/eclipse/galileo/org.eclipse.releng.basebuilde... + fi + cd $cvsProjectBaseDir; unzip -qq -d org.eclipse.releng.basebuilder $downloadsDir/org.eclipse.releng.basebuilder_${basebuilderBranch}.zip + + # reuse cached copy if available + if [[ -f $thirdPartyJarsDir/org.eclipse.pde.build.svn-1.0.1RC2.zip ]]; then + cp $thirdPartyJarsDir/org.eclipse.pde.build.svn-1.0.1RC2.zip $writableBuildRoot + fi + + # get pde.build.svn plugin (http://sourceforge.net/projects/svn-pde-build/) and unpack into releng.basebuilder's root folder + pushd $writableBuildRoot >/dev/null + if [[ ! -f org.eclipse.pde.build.svn-1.0.1RC2.zip ]]; then + wget --no-clobber http://downloads.sourceforge.net/svn-pde-build/org.eclipse.pde.build.svn-... + fi + unzip -qq org.eclipse.pde.build.svn-1.0.1RC2.zip -d org.eclipse.pde.build.svn + pushd org.eclipse.pde.build.svn/org.eclipse.releng.basebuilder/ >/dev/null + #mkdir -p $writableBuildRoot/org.eclipse.releng.basebuilder_${basebuilderBranch}/features + mkdir -p $writableBuildRoot/org.eclipse.releng.basebuilder_${basebuilderBranch}/plugins + for f in $(find . -maxdepth 2 -mindepth 2 -type f); do # remove "-type f" to collect features too; + g=${f:2}; + if [[ -d $writableBuildRoot/org.eclipse.releng.basebuilder_${basebuilderBranch}/$g ]] || [[ -f $writableBuildRoot/org.eclipse.releng.basebuilder_${basebuilderBranch}/$g ]]; then + rm -fr $writableBuildRoot/org.eclipse.releng.basebuilder_${basebuilderBranch}/$g; + fi + mv -f $g $writableBuildRoot/org.eclipse.releng.basebuilder_${basebuilderBranch}/$g + done + popd >/dev/null + rm -fr org.eclipse.pde.build.svn + popd >/dev/null + echo "[start] SVN support added to basebuilder." +fi + +############################################################################################## + +# exposed as a Hudson build parameter for convenience +if [[ $BUILDTYPE ]]; then + buildType="$BUILDTYPE" +else + buildType="N" +fi + +############################################################################################## + +# collect required variables +# could also set them here as variable="some value" static variables, or use +# export VARIABLE="some value" in Hudson script for convenience when copying/editing jobs + +# if NOT hardcoded here, then this script is COMPLETELY boilerplate and need not be copied into the build's .releng folder. + +haderror=0 +if [[ $PROJECTID ]]; then + projectid="$PROJECTID" +else + echo "Error: Must set projectid in run.sh or PROJECTID in Hudson config." + haderror=1 +fi + +if [[ $VERSION ]]; then + version="$VERSION" +else + echo "Error: Must set version in run.sh or VERSION in Hudson config." + haderror=1 +fi + +if [[ $PROJRELENGROOT ]]; then + projRelengRoot="$PROJRELENGROOT" +else + echo "Error: Must set projRelengRoot in run.sh or PROJRELENGROOT in Hudson config." + haderror=1 +fi + +if [[ $PROJRELENGPATH ]]; then + projRelengPath="$PROJRELENGPATH" +else + echo "Error: Must set projRelengPath in run.sh or PROJRELENGPATH in Hudson config." + haderror=1 +fi + +# optional override; assume HEAD or trunk if not specified +if [[ $PROJRELENGBRANCH ]]; then + projRelengBranch="$PROJRELENGBRANCH" +else + projRelengBranch=""; +fi + +# optional override +if [[ $PROJRELENGNAME ]]; then + projRelengName="$PROJRELENGNAME" +else + projRelengName=""; +fi + +if [[ $haderror -gt 0 ]]; then + exit 1; +fi + +# pass in additional flags like -buildAlias=1.0.0RC2 using the $EXTRAFLAGS Hudson parameter +# buildAlias will rename zips from foo-SDK-N200901011234.zip to foo-SDK-1.0.0RC2.zip + +############################################################################################## + +# define required folders +signingDir="${writableBuildRoot}/signing"; mkdir -p $signingDir + +# long form (default if omitted) +# buildDir="${writableBuildRoot}/${projectid//.//}/downloads/drops/${version}/${buildType}${buildTimestamp}" +# short form (non-default) +if [[ $SNAPSHOT ]]; then # build in a path that will always be the same (so downstream projects can depend on Update zip) + buildDir="${writableBuildRoot}/${buildType}-SNAPSHOT" + EXTRAFLAGS="-buildAlias ${buildType}-SNAPSHOT ${EXTRAFLAGS}" +else + buildDir="${writableBuildRoot}/${buildType}${buildTimestamp}" +fi + +# create required folders & files (as symlinks is possible) +mkdir -p ${downloadsDir} ${signingDir} ${buildDir} + +# create .cvspass file to shut up unnecessary warnings +touch ${writableBuildRoot}/.cvspass + +#define symlinked required folders +relengBaseBuilderDir="${writableBuildRoot}/org.eclipse.releng.basebuilder" +relengCommonBuilderDir="${writableBuildRoot}/org.eclipse.dash.common.releng" + +# symlink basebuilder and common.releng; alternatively, if you omit this, they'll be checked out in start.sh +ln -s ${cvsProjectBaseDir}/org.eclipse.releng.basebuilder ${writableBuildRoot}/ +ln -s ${cvsProjectBaseDir}/org.eclipse.dash.common.releng ${writableBuildRoot}/ + +# symlink 3rdPartyJars (reuse existing content) +ln -s ${thirdPartyJarsDir} ${writableBuildRoot}/ +thirdPartyJarsDir="${writableBuildRoot}/3rdPartyJars" + +# symlink downloads (reuse existing content) +ln -s ${downloadsDir} ${writableBuildRoot}/ +downloadsDir="${writableBuildRoot}/downloads" + +# clean up any *-SNAPSHOT.zip files in ${downloadsDir} +find ${downloadsDir} -maxdepth 1 -type f -name "*-SNAPSHOT.zip" -exec rm -f {} \; + +# run a build - may have to pass in "-javaHome /usr/lib/jvm/java" or similar here if default JVM not found +cd ${writableBuildRoot}/org.eclipse.dash.common.releng/tools/scripts +./start.sh -projectid ${projectid} -version ${version} -buildType ${buildType} -buildTimestamp ${buildTimestamp} \ + -writableBuildRoot ${writableBuildRoot} -thirdPartyJarsDir ${thirdPartyJarsDir} -downloadsDir ${downloadsDir} -buildDir ${buildDir} \ + ${projRelengName} ${projRelengRoot} ${projRelengPath} ${projRelengBranch} \ + -thirdPartyDownloadLicenseAcceptance -javaHome ${JAVA16} ${EXTRAFLAGS} 2>&1 + +# remove file so workspace navigation is one click simpler +rm -f ${writableBuildRoot}/.cvspass + +echo "[`date +%Y/%m/%d\ %H:%M`] Hudson job ${JOBNAME} build #${BUILD_NUMBER} (${BUILD_ID}) done." Property changes on: trunk/common/releng/hudson/run.sh ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18241 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/icons/full and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-10-22 14:00:25 -0400 (Thu, 22 Oct 2009) New Revision: 18241 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/freemarker_task.jpg trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/input_task.jpg trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/java_mapping_task.jpg trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddInputTaskAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksXSLTemplateGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/RuleBaseSectionFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValidationSectionFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddPreviousTaskNodeAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddTaskNodeAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java Log: JBIDE-5067 1.Add a toolbar above Process Viewer 2.List the Task in the toolbar 3.Implement DND from toolbar to Process Viewer. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-10-22 18:00:25 UTC (rev 18241) @@ -180,7 +180,7 @@ _UI_InlineDirective_replace_literal = replace _UI_InlineDirective_insertbefore_literal = insertbefore _UI_InlineDirective_insertafter_literal = insertafter -_UI_BindingsType_type = Bean +_UI_BindingsType_type = Java Class _UI_DecodeParamType_type = Decode Param _UI_ExpressionType_type = Expression Binding _UI_ValueType_type = Value Binding @@ -481,7 +481,7 @@ _UI_EDI12Reader_validate_feature = Validate # JavaBean version 1.2 -_UI_BeanType_type = Bean +_UI_BeanType_type = Java Class _UI_DecodeParamType_type = Decode Param Type _UI_Javabean12DocumentRoot_type = Document Root _UI_ExpressionType_type = Expression Binding Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/freemarker_task.jpg =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/freemarker_task.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/input_task.jpg =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/input_task.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/java_mapping_task.jpg =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj32/java_mapping_task.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -65,6 +65,15 @@ protected void initializeImageRegistry(ImageRegistry reg) { super.initializeImageRegistry(reg); + // registe task image + reg.put(GraphicsConstants.IMAGE_APPLY_FREEMARKER_TASK, imageDescriptorFromPlugin(PLUGIN_ID, + GraphicsConstants.IMAGE_APPLY_FREEMARKER_TASK)); + reg.put(GraphicsConstants.IMAGE_JAVA_AMPPING_TASK, imageDescriptorFromPlugin(PLUGIN_ID, + GraphicsConstants.IMAGE_JAVA_AMPPING_TASK)); + reg.put(GraphicsConstants.IMAGE_INPUT_TASK, imageDescriptorFromPlugin(PLUGIN_ID, + GraphicsConstants.IMAGE_INPUT_TASK)); + + // normal reg.put(GraphicsConstants.IMAGE_PROPERTY_SHEET_PAGE, getImageDescriptor(GraphicsConstants.IMAGE_PROPERTY_SHEET_PAGE)); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConstants.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConstants.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -31,8 +31,4 @@ public static final String VERSION_1_2 = "1.2"; public static final String[] SMOOKS_VERSIONS = new String[]{VERSION_1_0,VERSION_1_1,VERSION_1_2}; - - public static final String TASK_ID_INPUT = "input"; - - public static final String TASK_ID_JAVA_MAPPING = "java_mapping"; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -6,6 +6,12 @@ public static final Color BORDER_CORLOER = new Color(null,128,128,128); + public static final String IMAGE_JAVA_AMPPING_TASK = "icons/full/obj32/java_mapping_task.jpg"; + + public static final String IMAGE_APPLY_FREEMARKER_TASK = "icons/full/obj32/freemarker_task.jpg"; + + public static final String IMAGE_INPUT_TASK = "icons/full/obj32/input_task.jpg"; + public static final String IMAGE_JAVA_ATTRIBUTE = "icons/full/obj16/att_obj.gif"; public static final String IMAGE_VALIDATED_TAG = "icons/full/obj16/validated_tag.gif"; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/RuleBaseSectionFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/RuleBaseSectionFilter.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/RuleBaseSectionFilter.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -11,9 +11,6 @@ package org.jboss.tools.smooks.editor.propertySections; import org.eclipse.jface.viewers.IFilter; -import org.jboss.tools.smooks.graphical.editors.editparts.InputDataContainerEditPart; -import org.jboss.tools.smooks.graphical.editors.editparts.InputDataTreeNodeEditPart; -import org.jboss.tools.smooks.graphical.editors.editparts.SmooksRootEditPart; /** * @author Dart @@ -25,17 +22,18 @@ * @see org.eclipse.jface.viewers.IFilter#select(java.lang.Object) */ public boolean select(Object toTest) { - if(toTest == null) return false; - if(toTest instanceof InputDataTreeNodeEditPart){ - return true; - } - if(toTest instanceof InputDataContainerEditPart){ - return true; - } - if(toTest instanceof SmooksRootEditPart){ - return true; - } return false; +// if(toTest == null) return false; +// if(toTest instanceof InputDataTreeNodeEditPart){ +// return true; +// } +// if(toTest instanceof InputDataContainerEditPart){ +// return true; +// } +// if(toTest instanceof SmooksRootEditPart){ +// return true; +// } +// return false; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValidationSectionFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValidationSectionFilter.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/propertySections/ValidationSectionFilter.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -11,7 +11,6 @@ package org.jboss.tools.smooks.editor.propertySections; import org.eclipse.jface.viewers.IFilter; -import org.jboss.tools.smooks.graphical.editors.editparts.InputDataTreeNodeEditPart; /** * @author Dart @@ -23,10 +22,10 @@ * @see org.eclipse.jface.viewers.IFilter#select(java.lang.Object) */ public boolean select(Object toTest) { - if(toTest == null) return false; - if(toTest instanceof InputDataTreeNodeEditPart){ - return true; - } +// if(toTest == null) return false; +// if(toTest instanceof InputDataTreeNodeEditPart){ +// return true; +// } return false; } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddInputTaskAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddInputTaskAction.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddInputTaskAction.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -0,0 +1,60 @@ +/******************************************************************************* + * 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.actions; + +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.edit.command.AddCommand; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.graphical.editors.TaskTypeManager; +import org.jboss.tools.smooks.model.graphics.ext.GraphFactory; +import org.jboss.tools.smooks.model.graphics.ext.GraphPackage; +import org.jboss.tools.smooks.model.graphics.ext.ProcessType; +import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; +import org.jboss.tools.smooks.model.graphics.ext.TaskType; + +/** + * @author Dart + * + */ +public class AddInputTaskAction extends AddNextTaskNodeAction { + + + + public AddInputTaskAction(ISmooksModelProvider provider) { + super(TaskTypeManager.TASK_ID_INPUT, "Add Input Task", provider); + } + + @Override + public void run() { + if (this.provider != null) { + SmooksGraphicsExtType graph = provider.getSmooksGraphicsExt(); + ProcessType process = graph.getProcesses().getProcess(); + if (process != null && process.getTask().isEmpty()) { + TaskType childTask = GraphFactory.eINSTANCE.createTaskType(); + childTask.setId(taskID); + childTask.setName("Input Task"); + Command command = AddCommand.create(provider.getEditingDomain(), process, + GraphPackage.Literals.PROCESS_TYPE__TASK, childTask); + provider.getEditingDomain().getCommandStack().execute(command); + } + } + } + + @Override + public void update() { + this.setEnabled(false); + SmooksGraphicsExtType graph = provider.getSmooksGraphicsExt(); + ProcessType process = graph.getProcesses().getProcess(); + if (process != null && process.getTask().isEmpty()) { + this.setEnabled(true); + } + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddInputTaskAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddNextTaskNodeAction.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -10,12 +10,8 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.actions; -import java.util.Iterator; -import java.util.List; - import org.eclipse.emf.common.command.Command; import org.eclipse.emf.edit.command.AddCommand; -import org.jboss.tools.smooks.configuration.SmooksConstants; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.model.graphics.ext.GraphFactory; import org.jboss.tools.smooks.model.graphics.ext.GraphPackage; @@ -26,7 +22,7 @@ * */ public class AddNextTaskNodeAction extends AddTaskNodeAction { - + public AddNextTaskNodeAction(String taskID, String text, ISmooksModelProvider provider) { super(taskID, text, provider); } @@ -54,25 +50,9 @@ public void update() { super.update(); if (this.isEnabled()) { - TaskType parentTask = this.getCurrentSelectedTask().get(0); - String currentTaskID = parentTask.getId(); - if (currentTaskID.equals(SmooksConstants.TASK_ID_INPUT)) { - if (!SmooksConstants.TASK_ID_JAVA_MAPPING.equals(taskID)){ - this.setEnabled(false); - }else{ - List<?> taskList = parentTask.getTask(); - for (Iterator<?> iterator = taskList.iterator(); iterator.hasNext();) { - TaskType object = (TaskType) iterator.next(); - if(SmooksConstants.TASK_ID_JAVA_MAPPING.equals(object.getId())){ - this.setEnabled(false); - } - } - } - } - if (currentTaskID.equals(SmooksConstants.TASK_ID_JAVA_MAPPING)) { -// if (!SmooksConstants.TASK_ID_JAVA_MAPPING.equals(taskID)) - this.setEnabled(false); - } + TaskType testTaskType = GraphFactory.eINSTANCE.createTaskType(); + testTaskType.setId(taskID); + setEnabled(rules.isNextTask(this.getCurrentSelectedTask().get(0),testTaskType)); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddPreviousTaskNodeAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddPreviousTaskNodeAction.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddPreviousTaskNodeAction.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.actions; -import java.util.Iterator; -import java.util.List; - import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CompoundCommand; import org.eclipse.emf.ecore.EObject; @@ -20,7 +17,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.command.DeleteCommand; -import org.jboss.tools.smooks.configuration.SmooksConstants; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.model.graphics.ext.GraphFactory; import org.jboss.tools.smooks.model.graphics.ext.GraphPackage; @@ -79,26 +75,9 @@ public void update() { super.update(); if (this.isEnabled()) { - TaskType parentTask = this.getCurrentSelectedTask().get(0); - String parentID = parentTask.getId(); - - if (parentID.equals(SmooksConstants.TASK_ID_INPUT)) { - // if (!SmooksConstants.TASK_ID_JAVA_MAPPING.equals(taskID)) - this.setEnabled(false); - } - - if (parentID.equals(SmooksConstants.TASK_ID_JAVA_MAPPING)) { - if (!SmooksConstants.TASK_ID_INPUT.equals(taskID)) { - this.setEnabled(false); - } else { - EObject obj = parentTask.eContainer(); - if(obj instanceof TaskType){ - if (SmooksConstants.TASK_ID_INPUT.equals(((TaskType)obj).getId())) { - this.setEnabled(false); - } - } - } - } + TaskType testTaskType = GraphFactory.eINSTANCE.createTaskType(); + testTaskType.setId(taskID); + setEnabled(rules.isPreTask(this.getCurrentSelectedTask().get(0),testTaskType)); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddTaskNodeAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddTaskNodeAction.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AddTaskNodeAction.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -1,12 +1,14 @@ package org.jboss.tools.smooks.graphical.actions; -import org.jboss.tools.smooks.configuration.SmooksConstants; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.graphical.editors.TaskTypeManager; import org.jboss.tools.smooks.model.graphics.ext.TaskType; public class AddTaskNodeAction extends AbstractProcessGraphAction { - + protected String taskID = null; + + protected TaskTypeRules rules = new TaskTypeRules(); public AddTaskNodeAction(String taskID, String text, ISmooksModelProvider provider) { super(text, provider); @@ -32,7 +34,7 @@ TaskType currentTask = this.getCurrentSelectedTask().get(0); String taskID = currentTask.getId(); if (taskID != null) { - if (taskID.equals(SmooksConstants.TASK_ID_INPUT) || taskID.equals(SmooksConstants.TASK_ID_JAVA_MAPPING)) + if (taskID.equals(TaskTypeManager.TASK_ID_INPUT) || taskID.equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) this.setEnabled(true); } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -0,0 +1,72 @@ +/******************************************************************************* + * 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.actions; + +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.jboss.tools.smooks.graphical.editors.TaskTypeManager; +import org.jboss.tools.smooks.model.graphics.ext.TaskType; + +/** + * @author Dart + * + */ +public class TaskTypeRules { + + public boolean isNextTask(TaskType currentTask, TaskType testTask) { + TaskType parentTask = testTask; + String parentID = parentTask.getId(); + + if (parentID.equals(TaskTypeManager.TASK_ID_INPUT)) { + // if (!SmooksConstants.TASK_ID_JAVA_MAPPING.equals(taskID)) + return false; + } + + if (parentID.equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) { + if (!TaskTypeManager.TASK_ID_INPUT.equals(currentTask.getId())) { + return false; + } else { + EObject obj = parentTask.eContainer(); + if (obj instanceof TaskType) { + if (TaskTypeManager.TASK_ID_INPUT.equals(((TaskType) obj).getId())) { + return false; + } + } + } + } + return true; + } + + public boolean isPreTask(TaskType currentTask, TaskType testTask) { + TaskType parentTask = testTask; + String currentTaskID = parentTask.getId(); + if (currentTaskID.equals(TaskTypeManager.TASK_ID_INPUT)) { + if (!TaskTypeManager.TASK_ID_JAVA_MAPPING.equals(currentTask.getId())) { + return false; + } else { + List<?> taskList = parentTask.getTask(); + for (Iterator<?> iterator = taskList.iterator(); iterator.hasNext();) { + TaskType object = (TaskType) iterator.next(); + if (TaskTypeManager.TASK_ID_JAVA_MAPPING.equals(object.getId())) { + return false; + } + } + } + } + if (currentTaskID.equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) { + // if (!SmooksConstants.TASK_ID_JAVA_MAPPING.equals(taskID)) + return false; + } + return true; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/TaskTypeRules.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -13,18 +13,11 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ITreeContentProvider; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; -import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; -import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel; -import org.jboss.tools.smooks.graphical.editors.model.ResourceConfigGraphModelImpl; -import org.jboss.tools.smooks.graphical.editors.model.XSLTemplateContentProvider; -import org.jboss.tools.smooks.graphical.editors.model.XSLTemplateGraphicalModel; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean.ExpressionType; @@ -33,9 +26,7 @@ import org.jboss.tools.smooks.model.javabean12.BeanType; import org.jboss.tools.smooks.model.rules10.RuleBase; import org.jboss.tools.smooks.model.rules10.RuleBasesType; -import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; import org.jboss.tools.smooks.model.validation10.RuleType; -import org.jboss.tools.smooks.model.xsl.Xsl; /** * @author Dart @@ -46,7 +37,7 @@ public GraphicalModelFactoryImpl() { } - private ILabelProvider createLabelProvider(AdapterFactory factory) { + protected ILabelProvider createLabelProvider(AdapterFactory factory) { return new AdapterFactoryLabelProvider(factory) { /* * (non-Javadoc) @@ -66,7 +57,7 @@ }; } - private String getGraphLabelText(Object element) { + protected String getGraphLabelText(Object element) { Object obj = AdapterFactoryEditingDomain.unwrap(element); if (obj instanceof BeanType) { String p = ((BeanType) obj).getBeanId(); @@ -128,12 +119,18 @@ } return null; } + + protected boolean canCreateGraphicalModel(Object model,ISmooksModelProvider provider){ + SmooksGraphicsExtType extType = provider.getSmooksGraphicsExt(); + String version = extType.getPlatformVersion(); + if (SmooksUIUtils.isUnSupportElement(version, (EObject) model)) { + return false; + } + return true; + } public Object createGraphicalModel(Object model, ISmooksModelProvider provider) { AbstractSmooksGraphicalModel graphModel = null; - AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider.getEditingDomain(); - ITreeContentProvider contentProvider = new AdapterFactoryContentProvider(editingDomain.getAdapterFactory()); - ILabelProvider labelProvider = createLabelProvider(editingDomain.getAdapterFactory()); SmooksGraphicsExtType extType = provider.getSmooksGraphicsExt(); String version = extType.getPlatformVersion(); @@ -144,19 +141,19 @@ if (SmooksUIUtils.isUnSupportElement(version, (EObject) model)) { return null; } - if (model instanceof BindingsType || model instanceof BeanType) { - graphModel = new JavaBeanGraphModel(model, contentProvider, labelProvider, provider); - ((JavaBeanGraphModel) graphModel).setHeaderVisable(true); - } - if (model instanceof Xsl) { - graphModel = new XSLTemplateGraphicalModel(model, new XSLTemplateContentProvider(contentProvider), - new XSLLabelProvider(labelProvider), provider); - ((TreeContainerModel) graphModel).setHeaderVisable(true); - } - if (graphModel == null && model instanceof AbstractResourceConfig) { - graphModel = new ResourceConfigGraphModelImpl(model, contentProvider, labelProvider, provider); - ((ResourceConfigGraphModelImpl) graphModel).setHeaderVisable(true); - } +// if (model instanceof BindingsType || model instanceof BeanType) { +// graphModel = new JavaBeanGraphModel(model, contentProvider, labelProvider, provider); +// ((JavaBeanGraphModel) graphModel).setHeaderVisable(true); +// } +// if (model instanceof Xsl) { +// graphModel = new XSLTemplateGraphicalModel(model, new XSLTemplateContentProvider(contentProvider), +// new XSLLabelProvider(labelProvider), provider); +// ((TreeContainerModel) graphModel).setHeaderVisable(true); +// } +// if (graphModel == null && model instanceof AbstractResourceConfig) { +// graphModel = new ResourceConfigGraphModelImpl(model, contentProvider, labelProvider, provider); +// ((ResourceConfigGraphModelImpl) graphModel).setHeaderVisable(true); +// } return graphModel; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -78,7 +78,7 @@ return null; } }; - drawer.add(new ConnectionCreationToolEntry("Trigger Link", "Link", factory, null, null)); + drawer.add(new ConnectionCreationToolEntry("Link", "Connect node", factory, null, null)); root.add(drawer); createPaletteDrawer(root); @@ -222,11 +222,14 @@ } return false; } + + protected void fillActionGrouper(List<ISmooksActionGrouper> grouperList){ + + } - private List<ISmooksActionGrouper> getSmooksActionGrouper() { + protected List<ISmooksActionGrouper> getSmooksActionGrouper() { List<ISmooksActionGrouper> grouperList = new ArrayList<ISmooksActionGrouper>(); - - grouperList.add(new JavaBean11ActionGrouper()); + fillActionGrouper(grouperList); // grouperList.add(new Reader11ActionGrouper()); // grouperList.add(new Calc11ActionGrouper()); // grouperList.add(new Database11ActionGrouper()); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -106,17 +106,17 @@ private DefaultEditDomain editDomain = null; - private ISmooksModelProvider smooksModelProvider = null; + protected ISmooksModelProvider smooksModelProvider = null; - private RootModel root; + protected RootModel root; - private SmooksResourceListType smooksResourceList; + protected SmooksResourceListType smooksResourceList; - private List<Object> inputDataList = null; + protected List<Object> inputDataList = null; - private GraphicalModelFactory graphicalModelFactory; + protected GraphicalModelFactory graphicalModelFactory; - private ConnectionModelFactory connectionModelFactory; + protected ConnectionModelFactory connectionModelFactory; public SmooksGraphicalEditorPart(ISmooksModelProvider provider) { super(); @@ -183,10 +183,6 @@ getEditorSite().getShell().getDisplay().asyncExec(new Runnable() { public void run() { if (mostRecentCommand != null) { - // if (getProcessGraphViewer() != null) { - // getProcessGraphViewer().refresh(); - // getProcessGraphViewer().applyLayout(); - // } Command rawCommand = mostRecentCommand; while (rawCommand instanceof CommandWrapper) { rawCommand = ((CommandWrapper) rawCommand).getCommand(); @@ -223,7 +219,7 @@ return connectionModelFactory; } - private ConnectionModelFactory createConnectionModelFactory() { + protected ConnectionModelFactory createConnectionModelFactory() { return new ConnectionModelFactoryImpl(); } @@ -238,7 +234,7 @@ return graphicalModelFactory; } - private GraphicalModelFactory createGraphicalModelFactory() { + protected GraphicalModelFactory createGraphicalModelFactory() { return new GraphicalModelFactoryImpl(); } @@ -610,11 +606,9 @@ @Override protected void hookGraphicalViewer() { - // super.hookGraphicalViewer(); + super.hookGraphicalViewer(); getGraphicalViewer().addSelectionChangedListener(getSelectionSynchronizer()); getGraphicalViewer().addSelectionChangedListener(this); - - getEditorSite().setSelectionProvider(getGraphicalViewer()); } protected void initGraphicalModel() { Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -0,0 +1,214 @@ +/******************************************************************************* + * 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; + +import java.util.List; + +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.gef.palette.PaletteRoot; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.JavaBean11ActionGrouper; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel; +import org.jboss.tools.smooks.model.javabean.BindingsType; +import org.jboss.tools.smooks.model.javabean.ExpressionType; +import org.jboss.tools.smooks.model.javabean.ValueType; +import org.jboss.tools.smooks.model.javabean.WiringType; +import org.jboss.tools.smooks.model.javabean12.BeanType; + +/** + * @author Dart + * + */ +public class SmooksJavaMappingGraphicalEditor extends SmooksGraphicalEditorPart { + + public SmooksJavaMappingGraphicalEditor(ISmooksModelProvider provider) { + super(provider); + // TODO Auto-generated constructor stub + } + + + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart#getPaletteRoot() + */ + @Override + protected PaletteRoot getPaletteRoot() { + SmooksGraphicalEditorPaletteRootCreator creator = new SmooksGraphicalEditorPaletteRootCreator( + this.smooksModelProvider, (AdapterFactoryEditingDomain) this.smooksModelProvider.getEditingDomain(), + getSmooksResourceListType()){ + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPaletteRootCreator#fillActionGrouper(java.util.List) + */ + @Override + protected void fillActionGrouper(List<ISmooksActionGrouper> grouperList) { + grouperList.add(new JavaBean11ActionGrouper()); + } + + }; + return creator.createPaletteRoot(); + } + + + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart# + * createConnectionModelFactory() + */ + @Override + protected ConnectionModelFactory createConnectionModelFactory() { + return new JavaMappingConnectionModelFactory(); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart# + * createGraphicalModelFactory() + */ + @Override + protected GraphicalModelFactory createGraphicalModelFactory() { + return new JavaMappingGraphicalModelFactory(); + } + + private class JavaMappingConnectionModelFactory extends ConnectionModelFactoryImpl { + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.graphical.editors.ConnectionModelFactoryImpl + * #hasXSLConnection + * (org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel) + */ + @Override + public boolean hasXSLConnection(AbstractSmooksGraphicalModel model) { + return false; + } + + } + + private class JavaMappingGraphicalModelFactory extends GraphicalModelFactoryImpl { + protected String getGraphLabelText(Object element) { + Object obj = AdapterFactoryEditingDomain.unwrap(element); + if (obj instanceof BeanType) { + String p = ((BeanType) obj).getBeanId(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + if (obj instanceof BindingsType) { + String p = ((BindingsType) obj).getBeanId(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + + if (obj instanceof ValueType) { + String p = ((ValueType) obj).getProperty(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + if (obj instanceof WiringType) { + String p = ((WiringType) obj).getProperty(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + if (obj instanceof ExpressionType) { + String p = ((ExpressionType) obj).getProperty(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + + if (obj instanceof org.jboss.tools.smooks.model.javabean12.ValueType) { + String p = ((org.jboss.tools.smooks.model.javabean12.ValueType) obj).getProperty(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + if (obj instanceof org.jboss.tools.smooks.model.javabean12.WiringType) { + String p = ((org.jboss.tools.smooks.model.javabean12.WiringType) obj).getProperty(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + if (obj instanceof org.jboss.tools.smooks.model.javabean12.ExpressionType) { + String p = ((org.jboss.tools.smooks.model.javabean12.ExpressionType) obj).getProperty(); + if (p == null) { + p = "<NULL>"; + } + return p; + } + return null; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.graphical.editors.GraphicalModelFactoryImpl + * #createGraphicalModel(java.lang.Object, + * org.jboss.tools.smooks.editor.ISmooksModelProvider) + */ + @Override + public Object createGraphicalModel(Object model, ISmooksModelProvider provider) { + if (canCreateGraphicalModel(model, provider)) { + AbstractSmooksGraphicalModel graphModel = null; + AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider.getEditingDomain(); + ITreeContentProvider contentProvider = new AdapterFactoryContentProvider(editingDomain + .getAdapterFactory()); + ILabelProvider labelProvider = createLabelProvider(editingDomain.getAdapterFactory()); + + if (model instanceof BindingsType || model instanceof BeanType) { + graphModel = new JavaBeanGraphModel(model, contentProvider, labelProvider, provider); + ((JavaBeanGraphModel) graphModel).setHeaderVisable(true); + } + // if (model instanceof Xsl) { + // graphModel = new XSLTemplateGraphicalModel(model, new + // XSLTemplateContentProvider(contentProvider), + // new XSLLabelProvider(labelProvider), provider); + // ((TreeContainerModel) graphModel).setHeaderVisable(true); + // } + // if (graphModel == null && model instanceof + // AbstractResourceConfig) { + // graphModel = new ResourceConfigGraphModelImpl(model, + // contentProvider, labelProvider, provider); + // ((ResourceConfigGraphModelImpl) + // graphModel).setHeaderVisable(true); + // } + if (graphModel != null) { + return graphModel; + } + return super.createGraphicalModel(graphModel, provider); + } + return null; + } + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksJavaMappingGraphicalEditor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -19,11 +19,13 @@ import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.draw2d.IFigure; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CommandWrapper; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.gef.dnd.TemplateTransfer; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; @@ -32,15 +34,26 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.dnd.DND; +import org.eclipse.swt.dnd.DragSource; +import org.eclipse.swt.dnd.DragSourceEvent; +import org.eclipse.swt.dnd.DragSourceListener; +import org.eclipse.swt.dnd.DropTargetEvent; +import org.eclipse.swt.dnd.DropTargetListener; +import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.ToolBar; +import org.eclipse.swt.widgets.ToolItem; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorSite; @@ -57,20 +70,24 @@ import org.eclipse.ui.forms.widgets.ScrolledPageBook; import org.eclipse.ui.forms.widgets.Section; import org.eclipse.zest.core.viewers.GraphViewer; +import org.eclipse.zest.core.widgets.Graph; +import org.eclipse.zest.core.widgets.GraphNode; import org.eclipse.zest.core.widgets.ZestStyles; import org.eclipse.zest.layouts.LayoutStyles; import org.eclipse.zest.layouts.algorithms.HorizontalTreeLayoutAlgorithm; -import org.jboss.tools.smooks.configuration.SmooksConstants; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.editor.AbstractSmooksFormEditor; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.editor.ISourceSynchronizeListener; import org.jboss.tools.smooks.graphical.actions.AbstractProcessGraphAction; +import org.jboss.tools.smooks.graphical.actions.AddInputTaskAction; import org.jboss.tools.smooks.graphical.actions.AddNextTaskNodeAction; import org.jboss.tools.smooks.graphical.actions.AddPreviousTaskNodeAction; import org.jboss.tools.smooks.graphical.actions.AddTaskNodeAction; import org.jboss.tools.smooks.graphical.actions.DeleteTaskNodeAction; +import org.jboss.tools.smooks.graphical.actions.TaskTypeRules; +import org.jboss.tools.smooks.graphical.editors.TaskTypeManager.TaskTypeDescriptor; import org.jboss.tools.smooks.model.graphics.ext.GraphFactory; -import org.jboss.tools.smooks.model.graphics.ext.GraphPackage; import org.jboss.tools.smooks.model.graphics.ext.ISmooksGraphChangeListener; import org.jboss.tools.smooks.model.graphics.ext.ProcessType; import org.jboss.tools.smooks.model.graphics.ext.ProcessesType; @@ -115,13 +132,25 @@ protected void createProcessGraphicalPanel(Composite parent) { processGraphViewer = new GraphViewer(parent, SWT.NONE); + // GridData gd = new GridData(GridData.FILL_BOTH); + // processGraphViewer.getControl().setLayoutData(gd); + processGraphViewer.setNodeStyle(ZestStyles.NODES_FISHEYE); processGraphViewer.setContentProvider(new ProcessGraphContentProvider()); - processGraphViewer.setLabelProvider(new LabelProvider() { @Override public Image getImage(Object element) { - // TODO Auto-generated method stub + if (element instanceof TaskType) { + String id = ((TaskType) element).getId(); + List<TaskTypeDescriptor> des = TaskTypeManager.getAllTaskList(); + for (Iterator<?> iterator = des.iterator(); iterator.hasNext();) { + TaskTypeDescriptor taskTypeDescriptor = (TaskTypeDescriptor) iterator.next(); + if (taskTypeDescriptor.getId().equals(id)) { + return SmooksConfigurationActivator.getDefault().getImageRegistry().get( + taskTypeDescriptor.getImagePath()); + } + } + } return super.getImage(element); } @@ -173,6 +202,108 @@ } } + protected void hookProcessGraphicalViewer() { + + getProcessGraphViewer().getControl(); + getProcessGraphViewer().addDropSupport(DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK, + new Transfer[] { TemplateTransfer.getInstance() }, new DropTargetListener() { + private TaskType taskType = null; + + private ProcessType process = null; + + public void dropAccept(DropTargetEvent event) { + + } + + public void drop(DropTargetEvent event) { + if (event.detail == DND.DROP_COPY) { + if (this.taskType != null) { + TaskTypeDescriptor des = (TaskTypeDescriptor) TemplateTransfer.getInstance() + .getTemplate(); + AddNextTaskNodeAction action = new AddNextTaskNodeAction(des.getId(), des.getLabel(), + smooksModelProvider); + TaskType taskType = this.taskType; + IStructuredSelection selection = new StructuredSelection(taskType); + action.selectionChanged(new SelectionChangedEvent(getProcessGraphViewer(), selection)); + action.run(); + return; + } + if (this.process != null) { + AddNextTaskNodeAction action = new AddInputTaskAction(smooksModelProvider); +// IStructuredSelection selection = new StructuredSelection(taskType); +// action.selectionChanged(new SelectionChangedEvent(getProcessGraphViewer(), selection)); + action.run(); + return; + } + } + } + + public void dragOver(DropTargetEvent event) { + Control control = getProcessGraphViewer().getControl(); + if (control != null && control instanceof Graph) { + Graph graph = (Graph) control; + Point pp = graph.toControl(new Point(event.x, event.y)); + TaskTypeDescriptor des = (TaskTypeDescriptor) TemplateTransfer.getInstance().getTemplate(); + TaskType testType = GraphFactory.eINSTANCE.createTaskType(); + testType.setId(des.getId()); + IFigure figure = graph.getFigureAt(pp.x, pp.y); + if (figure == null) { + if (testType.getId().equals(TaskTypeManager.TASK_ID_INPUT)) { + ProcessType process = (ProcessType) getProcessGraphViewer().getInput(); + if (process.getTask().isEmpty()) { + event.detail = DND.DROP_COPY; + this.process = process; + return; + } + } + event.detail = DND.DROP_NONE; + this.taskType = null; + process = null; + return; + } + List<?> nodes = graph.getNodes(); + for (Iterator<?> iterator = nodes.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof GraphNode) { + IFigure f = ((GraphNode) object).getNodeFigure(); + if (figure == f) { + TaskTypeRules rules = new TaskTypeRules(); + if (rules.isNextTask((TaskType) ((GraphNode) object).getData(), testType)) { + event.detail = DND.DROP_COPY; + this.taskType = (TaskType) ((GraphNode) object).getData(); + return; + } + } + } + } + event.detail = DND.DROP_NONE; + this.taskType = null; + this.process = null; + } + } + + public void dragOperationChanged(DropTargetEvent event) { + } + + public void dragLeave(DropTargetEvent event) { + } + + public void dragEnter(DropTargetEvent event) { + event.detail = DND.DROP_MOVE; + this.taskType = null; + process = null; + } + }); + getProcessGraphViewer().addSelectionChangedListener(new ISelectionChangedListener() { + + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + Object firstElement = selection.getFirstElement(); + showTaskControl(firstElement); + } + }); + } + protected void configProcessGraphicalViewer() { MenuManager manager = new MenuManager(); @@ -197,80 +328,49 @@ protected void initProcessGraphicalPanelActions(IMenuManager manager) { - AddTaskNodeAction addInputTaskAction = new AddTaskNodeAction(SmooksConstants.TASK_ID_INPUT, "Add Input Task", - smooksModelProvider) { - - @Override - public void run() { - if (this.provider != null) { - SmooksGraphicsExtType graph = provider.getSmooksGraphicsExt(); - ProcessType process = graph.getProcesses().getProcess(); - if (process != null && process.getTask().isEmpty()) { - TaskType childTask = GraphFactory.eINSTANCE.createTaskType(); - childTask.setId(taskID); - childTask.setName("Input Task"); - Command command = AddCommand.create(provider.getEditingDomain(), process, - GraphPackage.Literals.PROCESS_TYPE__TASK, childTask); - provider.getEditingDomain().getCommandStack().execute(command); - } - } - } - - @Override - public void update() { - this.setEnabled(false); - SmooksGraphicsExtType graph = smooksModelProvider.getSmooksGraphicsExt(); - ProcessType process = graph.getProcesses().getProcess(); - if (process != null && process.getTask().isEmpty()) { - this.setEnabled(true); - } - } - - }; + AddTaskNodeAction addInputTaskAction = new AddInputTaskAction(smooksModelProvider); manager.add(addInputTaskAction); processPanelActions.add(addInputTaskAction); MenuManager addNextTaskMenuManager = new MenuManager("Add Next Task"); manager.add(addNextTaskMenuManager); - AddNextTaskNodeAction addNextInputAction = new AddNextTaskNodeAction(SmooksConstants.TASK_ID_INPUT, "Input", - smooksModelProvider); - this.processPanelActions.add(addNextInputAction); - addNextTaskMenuManager.add(addNextInputAction); + fillNextTaskMenu(addNextTaskMenuManager); - AddNextTaskNodeAction addNextJavaMappingAction = new AddNextTaskNodeAction( - SmooksConstants.TASK_ID_JAVA_MAPPING, "Java Mapping", smooksModelProvider); - this.processPanelActions.add(addNextJavaMappingAction); - addNextTaskMenuManager.add(addNextJavaMappingAction); - MenuManager addPreTaskMenuManager = new MenuManager("Add Previous Task"); manager.add(addPreTaskMenuManager); - AddPreviousTaskNodeAction addPreInputAction = new AddPreviousTaskNodeAction(SmooksConstants.TASK_ID_INPUT, - "Input", smooksModelProvider); - this.processPanelActions.add(addPreInputAction); - addPreTaskMenuManager.add(addPreInputAction); + fillPreTaskMenu(addPreTaskMenuManager); - AddPreviousTaskNodeAction addPreJavaMappingAction = new AddPreviousTaskNodeAction( - SmooksConstants.TASK_ID_JAVA_MAPPING, "Java Mapping", smooksModelProvider); - this.processPanelActions.add(addPreJavaMappingAction); - addPreTaskMenuManager.add(addPreJavaMappingAction); - DeleteTaskNodeAction deleteAction = new DeleteTaskNodeAction(smooksModelProvider); manager.add(deleteAction); this.processPanelActions.add(deleteAction); - getProcessGraphViewer().addSelectionChangedListener(new ISelectionChangedListener() { + } - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection) event.getSelection(); - Object firstElement = selection.getFirstElement(); - showTaskControl(firstElement); - } - }); + private void fillNextTaskMenu(MenuManager addNextTaskMenuManager) { + List<TaskTypeDescriptor> list = TaskTypeManager.getAllTaskList(); + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + TaskTypeDescriptor taskTypeDescriptor = (TaskTypeDescriptor) iterator.next(); + AddNextTaskNodeAction addNextInputAction = new AddNextTaskNodeAction(taskTypeDescriptor.getId(), + taskTypeDescriptor.getLabel(), smooksModelProvider); + this.processPanelActions.add(addNextInputAction); + addNextTaskMenuManager.add(addNextInputAction); + } } + private void fillPreTaskMenu(MenuManager addPreTaskMenuManager) { + List<TaskTypeDescriptor> list = TaskTypeManager.getAllTaskList(); + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + TaskTypeDescriptor taskTypeDescriptor = (TaskTypeDescriptor) iterator.next(); + AddPreviousTaskNodeAction addNextInputAction = new AddPreviousTaskNodeAction(taskTypeDescriptor.getId(), + taskTypeDescriptor.getLabel(), smooksModelProvider); + this.processPanelActions.add(addNextInputAction); + addPreTaskMenuManager.add(addNextInputAction); + } + } + public void registeTaskDetailsPage(IEditorPart editor, String taskID) { editor.addPropertyListener(this); this.registedTaskPages.put(taskID, editor); @@ -293,6 +393,125 @@ return processGraphViewer; } + protected void createProcessGraphicalSection(FormToolkit toolkit, Composite parent) { + Section processGraphSection = toolkit.createSection(parent, Section.DESCRIPTION | Section.TITLE_BAR); + processGraphSection.setText("Process Map"); + processGraphSection.setDescription("Right-Click to open the PopMenu to add or remove task node"); + + Composite processGraphComposite = toolkit.createComposite(processGraphSection); + + GridLayout processGraphGridLayoutLayout = new GridLayout(); + // processGraphFillLayout.marginWidth = 1; + // processGraphFillLayout.marginHeight = 1; + processGraphComposite.setLayout(processGraphGridLayoutLayout); + + processGraphSection.setClient(processGraphComposite); + + Composite toolBarComposite = toolkit.createComposite(processGraphComposite); + FillLayout l = new FillLayout(); + l.marginHeight = 1; + l.marginWidth = 1; + toolBarComposite.setLayout(l); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + toolBarComposite.setLayoutData(gd); + + toolBarComposite.setBackground(toolkit.getColors().getBorderColor()); + + createProcessToolBar(toolBarComposite, toolkit); + + Composite graphMainComposite = toolkit.createComposite(processGraphComposite); + FillLayout l1 = new FillLayout(); + l1.marginHeight = 1; + l1.marginWidth = 1; + graphMainComposite.setLayout(l1); + gd = new GridData(GridData.FILL_BOTH); + graphMainComposite.setLayoutData(gd); + graphMainComposite.setBackground(toolkit.getColors().getBorderColor()); + + createProcessGraphicalPanel(graphMainComposite); + + hookProcessGraphicalViewer(); + configProcessGraphicalViewer(); + initProcessGraphicalViewer(); + } + + protected void createProcessToolBar(Composite parent, FormToolkit toolkit) { + ToolBar toolBar = new ToolBar(parent, SWT.FLAT); + toolBar.setBackground(toolkit.getColors().getBackground()); + + Transfer[] types = new Transfer[] { TemplateTransfer.getInstance() }; + int operations = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK; + + final DragSource source = new DragSource(toolBar, operations); + source.setTransfer(types); + source.addDragListener(new DragSourceListener() { + + private Object data = null; + + public void dragStart(DragSourceEvent event) {this.data = null; + DragSource source = (DragSource) event.getSource(); + ToolBar control = (ToolBar) source.getControl(); + ToolItem item = control.getItem(new Point(event.x, event.y)); + if (item == null) + return; + event.doit = true; + TaskTypeDescriptor data = (TaskTypeDescriptor) item.getData(); + event.data = data; + this.data = data; + TemplateTransfer.getInstance().setObject(data); + } + + public void dragSetData(DragSourceEvent event) { + // DragSource source = (DragSource) event.getSource(); + // ToolBar control = (ToolBar) source.getControl(); + // ToolItem item = control.getItem(new Point(event.x, event.y)); + // if(item == null) return; + // TaskTypeDescriptor data = (TaskTypeDescriptor) + // item.getData(); + event.data = this.data; + TemplateTransfer.getInstance().setObject(this.data); + // System.out.println(data.getId()); + } + + public void dragFinished(DragSourceEvent event) { + // if (event.detail == DND.DROP_MOVE) + // label.setText (""); + this.data = null; + } + }); + + List<TaskTypeDescriptor> lis = TaskTypeManager.getAllTaskList(); + for (Iterator<?> iterator = lis.iterator(); iterator.hasNext();) { + TaskTypeDescriptor taskTypeDescriptor = (TaskTypeDescriptor) iterator.next(); + ToolItem item = new ToolItem(toolBar, SWT.NONE); + item.setData(taskTypeDescriptor); + // item.setText(taskTypeDescriptor.getLabel()); + item.setToolTipText("Add " + taskTypeDescriptor.getLabel()); + item.setImage(SmooksConfigurationActivator.getDefault().getImageRegistry().get( + taskTypeDescriptor.getImagePath())); + } + } + + protected void createTaskDetailsSection(FormToolkit toolkit, Composite parent) { + Composite taskDetailsComposite = toolkit.createComposite(parent); + FillLayout taskDetailsFillLayout = new FillLayout(); + taskDetailsFillLayout.marginWidth = 0; + taskDetailsFillLayout.marginHeight = 5; + taskDetailsComposite.setLayout(taskDetailsFillLayout); + + Section section = toolkit.createSection(taskDetailsComposite, Section.DESCRIPTION | Section.TITLE_BAR); + section.setText("Task Configuration"); + section.setDescription("Configurate the selected task"); + pageBook = new ScrolledPageBook(section); + pageBook.setBackground(toolkit.getColors().getBackground()); + section.setClient(pageBook); + + Composite emptyComposite = pageBook.createPage(emptyKey); + emptyComposite.setLayout(new FillLayout()); + createEmptyTaskPanel(emptyComposite, toolkit); + pageBook.showPage(emptyKey); + } + /* * (non-Javadoc) * @@ -307,7 +526,7 @@ FormToolkit toolkit = managedForm.getToolkit(); toolkit.decorateFormHeading(form.getForm()); form.getBody().setLayout(new FillLayout()); - form.setText("Process"); + form.setText("Processing"); Composite mainComposite = toolkit.createComposite(form.getBody()); @@ -321,44 +540,11 @@ GridData gd = new GridData(GridData.FILL_BOTH); sashForm.setLayoutData(gd); - Section processGraphSection = toolkit.createSection(sashForm, Section.DESCRIPTION | Section.TITLE_BAR); - processGraphSection.setText("Process Map"); - processGraphSection.setDescription("Right-Click to open the PopMenu to add or remove task node"); + createProcessGraphicalSection(toolkit, sashForm); - Composite processGraphComposite = toolkit.createComposite(processGraphSection); + createTaskDetailsSection(toolkit, sashForm); - FillLayout processGraphFillLayout = new FillLayout(); - processGraphFillLayout.marginWidth = 1; - processGraphFillLayout.marginHeight = 1; - processGraphComposite.setLayout(processGraphFillLayout); - - processGraphComposite.setBackground(toolkit.getColors().getBorderColor()); - - processGraphSection.setClient(processGraphComposite); - - createProcessGraphicalPanel(processGraphComposite); - configProcessGraphicalViewer(); - initProcessGraphicalViewer(); - - Composite taskDetailsComposite = toolkit.createComposite(sashForm); - FillLayout taskDetailsFillLayout = new FillLayout(); - taskDetailsFillLayout.marginWidth = 0; - taskDetailsFillLayout.marginHeight = 5; - taskDetailsComposite.setLayout(taskDetailsFillLayout); - - Section section = toolkit.createSection(taskDetailsComposite, Section.DESCRIPTION | Section.TITLE_BAR); - section.setText("Task Configuration"); - section.setDescription("Configurate the selected task"); - pageBook = new ScrolledPageBook(section); - pageBook.setBackground(toolkit.getColors().getBackground()); - section.setClient(pageBook); - - sashForm.setWeights(new int[] { 2, 8 }); - - Composite emptyComposite = pageBook.createPage(emptyKey); - emptyComposite.setLayout(new FillLayout()); - createEmptyTaskPanel(emptyComposite, toolkit); - pageBook.showPage(emptyKey); + sashForm.setWeights(new int[] { 3, 7 }); } private void handleCommandStack(org.eclipse.emf.common.command.CommandStack commandStack) { @@ -369,10 +555,22 @@ getEditorSite().getShell().getDisplay().asyncExec(new Runnable() { public void run() { if (mostRecentCommand != null) { - if (getProcessGraphViewer() != null) { - getProcessGraphViewer().refresh(); - getProcessGraphViewer().applyLayout(); + Command rawCommand = mostRecentCommand; + while (rawCommand instanceof CommandWrapper) { + rawCommand = ((CommandWrapper) rawCommand).getCommand(); } + Collection<?> activeModel = rawCommand.getAffectedObjects(); + for (Iterator<?> iterator = activeModel.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof TaskType || object instanceof ProcessType) { + if (getProcessGraphViewer() != null) { + getProcessGraphViewer().refresh(); + getProcessGraphViewer().applyLayout(); + } + + return; + } + } } } @@ -431,8 +629,12 @@ if (smooksModelProvider != null) { this.handleCommandStack(smooksModelProvider.getEditingDomain().getCommandStack()); } - SmooksGraphicalEditorPart javaMappingPart = new SmooksGraphicalEditorPart(smooksModelProvider); - this.registeTaskDetailsPage(javaMappingPart, SmooksConstants.TASK_ID_JAVA_MAPPING); + SmooksJavaMappingGraphicalEditor javaMappingPart = new SmooksJavaMappingGraphicalEditor(smooksModelProvider); + this.registeTaskDetailsPage(javaMappingPart, TaskTypeManager.TASK_ID_JAVA_MAPPING); + + SmooksXSLTemplateGraphicalEditor xsltemplatePart = new SmooksXSLTemplateGraphicalEditor(smooksModelProvider); + this.registeTaskDetailsPage(xsltemplatePart, TaskTypeManager.TASK_ID_XSL_TEMPLATE); + } @Override @@ -487,11 +689,11 @@ if (taskID == null) return null; - if (taskID.equals(SmooksConstants.TASK_ID_JAVA_MAPPING)) { + if (taskID.equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) { return null; } - if (taskID.equals(SmooksConstants.TASK_ID_INPUT)) { + if (taskID.equals(TaskTypeManager.TASK_ID_INPUT)) { GridLayout gl = new GridLayout(); gl.numColumns = 2; parent.setLayout(gl); @@ -577,6 +779,9 @@ } public void sourceChange(Object model) { + if (getProcessGraphViewer() != null) { + initProcessGraphicalViewer(); + } Collection<Object> editors = registedTaskPages.values(); for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksXSLTemplateGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksXSLTemplateGraphicalEditor.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksXSLTemplateGraphicalEditor.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -0,0 +1,159 @@ +/******************************************************************************* + * 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; + +import java.util.List; + +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.gef.palette.PaletteRoot; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.configuration.editors.actions.AbstractSmooksActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; +import org.jboss.tools.smooks.graphical.editors.model.XSLTemplateContentProvider; +import org.jboss.tools.smooks.graphical.editors.model.XSLTemplateGraphicalModel; +import org.jboss.tools.smooks.model.xsl.Xsl; + +/** + * @author Dart + * + */ +public class SmooksXSLTemplateGraphicalEditor extends SmooksGraphicalEditorPart { + + public SmooksXSLTemplateGraphicalEditor(ISmooksModelProvider provider) { + super(provider); + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart#getPaletteRoot() + */ + @Override + protected PaletteRoot getPaletteRoot() { + SmooksGraphicalEditorPaletteRootCreator creator = new SmooksGraphicalEditorPaletteRootCreator( + this.smooksModelProvider, (AdapterFactoryEditingDomain) this.smooksModelProvider.getEditingDomain(), + getSmooksResourceListType()){ + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPaletteRootCreator#fillActionGrouper(java.util.List) + */ + @Override + protected void fillActionGrouper(List<ISmooksActionGrouper> grouperList) { + AbstractSmooksActionGrouper xslgrouper = new AbstractSmooksActionGrouper() { + + public String getGroupName() { + return "XSL Template"; + } + + @Override + protected boolean canAdd(Object value) { + if (value instanceof Xsl) { + return true; + } + return false; + } + }; + grouperList.add(xslgrouper); + } + + }; + return creator.createPaletteRoot(); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart# + * createConnectionModelFactory() + */ + @Override + protected ConnectionModelFactory createConnectionModelFactory() { + return new XSLTemplateConnectionModelFactory(); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.graphical.editors.SmooksGraphicalEditorPart# + * createGraphicalModelFactory() + */ + @Override + protected GraphicalModelFactory createGraphicalModelFactory() { + return new XSLTemplateGraphicalModelFactory(); + } + + private class XSLTemplateConnectionModelFactory extends ConnectionModelFactoryImpl { + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.graphical.editors.ConnectionModelFactoryImpl + * #hasBeanIDConnection + * (org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel) + */ + @Override + public boolean hasBeanIDConnection(AbstractSmooksGraphicalModel model) { + return false; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.graphical.editors.ConnectionModelFactoryImpl + * #hasSelectorConnection + * (org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel) + */ + @Override + public boolean hasSelectorConnection(AbstractSmooksGraphicalModel model) { + return false; + } + } + + private class XSLTemplateGraphicalModelFactory extends GraphicalModelFactoryImpl { + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.graphical.editors.GraphicalModelFactoryImpl + * #createGraphicalModel(java.lang.Object, + * org.jboss.tools.smooks.editor.ISmooksModelProvider) + */ + @Override + public Object createGraphicalModel(Object model, ISmooksModelProvider provider) { + if (canCreateGraphicalModel(model, provider)) { + AbstractSmooksGraphicalModel graphModel = null; + AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider.getEditingDomain(); + ITreeContentProvider contentProvider = new AdapterFactoryContentProvider(editingDomain + .getAdapterFactory()); + ILabelProvider labelProvider = createLabelProvider(editingDomain.getAdapterFactory()); + + if (model instanceof Xsl) { + graphModel = new XSLTemplateGraphicalModel(model, new XSLTemplateContentProvider(contentProvider), + new XSLLabelProvider(labelProvider), provider); + ((TreeContainerModel) graphModel).setHeaderVisable(true); + } + if (graphModel != null) { + return graphModel; + } + return super.createGraphicalModel(graphModel, provider); + } + return null; + } + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksXSLTemplateGraphicalEditor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -0,0 +1,111 @@ +/******************************************************************************* + * 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; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; + +/** + * @author Dart + * + */ +public class TaskTypeManager { + public static final String TASK_ID_INPUT = "input"; + + public static final String TASK_ID_JAVA_MAPPING = "java_mapping"; + + public static final String TASK_ID_XSL_TEMPLATE = "xsl_template"; + + public static final String TASK_ID_FREEMARKER_TEMPLATE = "freemarker_template"; + + private static List<TaskTypeDescriptor> allTaskList = null; + + /** + * @return the allTaskList + */ + public static List<TaskTypeDescriptor> getAllTaskList() { + if (allTaskList == null) { + allTaskList = new ArrayList<TaskTypeDescriptor>(); + + // init + allTaskList.add(new TaskTypeDescriptor(TASK_ID_INPUT, "Input", GraphicsConstants.IMAGE_INPUT_TASK)); + allTaskList.add(new TaskTypeDescriptor(TASK_ID_JAVA_MAPPING, "Java Mapping", + GraphicsConstants.IMAGE_JAVA_AMPPING_TASK)); + allTaskList.add(new TaskTypeDescriptor(TASK_ID_FREEMARKER_TEMPLATE, "Apply Freemaker Template", + GraphicsConstants.IMAGE_APPLY_FREEMARKER_TASK)); + } + return allTaskList; + } + + public static final class TaskTypeDescriptor { + + private String id; + + private String label; + + private String imagePath; + + public TaskTypeDescriptor(String id, String label, String imagePath) { + this.id = id; + this.label = label; + this.imagePath = imagePath; + } + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id + * the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * @return the label + */ + public String getLabel() { + return label; + } + + /** + * @param label + * the label to set + */ + public void setLabel(String label) { + this.label = label; + } + + /** + * @return the imagePath + */ + public String getImagePath() { + return imagePath; + } + + /** + * @param imagePath + * the imagePath to set + */ + public void setImagePath(String imagePath) { + this.imagePath = imagePath; + } + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/TaskTypeManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -25,6 +25,7 @@ import org.jboss.tools.smooks.model.graphics.ext.GraphType; import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.xsl.Xsl; /** * @author Dart @@ -48,8 +49,17 @@ return null; } beanId = beanId.trim(); - return "BeanType" + beanId; + return "BeanType_" + beanId; } + + if (data instanceof Xsl) { + String id = ((Xsl) data).getApplyOnElement(); + if (id == null) { + id = ""; + } + id = id.trim(); + return "XSL_" + id; + } return null; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-10-22 16:44:44 UTC (rev 18240) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-10-22 18:00:25 UTC (rev 18241) @@ -11,6 +11,8 @@ package org.jboss.tools.smooks.graphical.editors.model; import java.util.Collection; +import java.util.Collections; +import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; @@ -23,6 +25,7 @@ import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean12.BeanType; @@ -136,6 +139,15 @@ return false; } + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#getChildren() + */ + @Override + public List<AbstractSmooksGraphicalModel> getChildren() { + List<AbstractSmooksGraphicalModel> list = Collections.emptyList(); + return list; + } + /* * (non-Javadoc) *

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18240 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2009-10-22 12:44:44 -0400 (Thu, 22 Oct 2009) New Revision: 18240 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java Log: Added logging. Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-22 15:30:15 UTC (rev 18239) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-10-22 16:44:44 UTC (rev 18240) @@ -979,7 +979,9 @@ return (ICSSModel) newModel; } catch (UnsupportedEncodingException e) { + WebKbPlugin.getDefault().logError(e); } catch (IOException e) { + WebKbPlugin.getDefault().logError(e); } return null;

14 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2009