JBoss Tools SVN: r12820 - trunk/as/docs/reference/en/images/perspective.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-24 11:24:36 -0500 (Wed, 24 Dec 2008)
New Revision: 12820
Modified:
trunk/as/docs/reference/en/images/perspective/perspective_4.png
trunk/as/docs/reference/en/images/perspective/perspective_5.png
trunk/as/docs/reference/en/images/perspective/perspective_7.png
Log:
https://jira.jboss.org/jira/browse/JBDS-417 - updating the screens;
Modified: trunk/as/docs/reference/en/images/perspective/perspective_4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_5.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_7.png
===================================================================
(Binary files differ)
16 years, 2 months
JBoss Tools SVN: r12819 - in documentation/trunk/movies: hbm_xml_editing and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-12-24 06:40:47 -0500 (Wed, 24 Dec 2008)
New Revision: 12819
Modified:
documentation/trunk/movies/archiving/archiving.wnk
documentation/trunk/movies/hbm_xml_editing/hbm_xml_editing.wnk
documentation/trunk/movies/seam_demo/seam_demo_part1.wnk
Log:
https://jira.jboss.org/jira/browse/JBDS-352
demos a reviewed, language is checked, time on frames is corrected
Modified: documentation/trunk/movies/archiving/archiving.wnk
===================================================================
(Binary files differ)
Modified: documentation/trunk/movies/hbm_xml_editing/hbm_xml_editing.wnk
===================================================================
(Binary files differ)
Modified: documentation/trunk/movies/seam_demo/seam_demo_part1.wnk
===================================================================
(Binary files differ)
16 years, 2 months
JBoss Tools SVN: r12818 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-12-24 04:30:10 -0500 (Wed, 24 Dec 2008)
New Revision: 12818
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewReverseEngineeringFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3462
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewReverseEngineeringFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewReverseEngineeringFileWizard.java 2008-12-24 08:40:58 UTC (rev 12817)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewReverseEngineeringFileWizard.java 2008-12-24 09:30:10 UTC (rev 12818)
@@ -36,6 +36,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
@@ -74,9 +75,8 @@
/** extended to update status messages on first show **/
static class ExtendedWizardNewFileCreationPage extends WizardNewFileCreationPage {
- public ExtendedWizardNewFileCreationPage(String pageName, IStructuredSelection selection) {
+ public ExtendedWizardNewFileCreationPage(String pageName, IStructuredSelection selection) {
super(pageName, selection);
- setContainerFullPath(new Path("/")); // TODO: make it based on the selection which should be available when doing the launch! //$NON-NLS-1$
}
boolean firstTime = true;
@@ -93,6 +93,7 @@
*/
public void addPages() {
+ if (selection == null) selection = new StructuredSelection();
cPage = new ExtendedWizardNewFileCreationPage( "Ccfgxml", selection ); //$NON-NLS-1$
cPage.setTitle( HibernateConsoleMessages.NewReverseEngineeringFileWizard_create_hibernate_reverse_engineering_file );
cPage.setDescription( HibernateConsoleMessages.NewReverseEngineeringFileWizard_create_new_hibernate_reveng_xml );
@@ -226,7 +227,7 @@
*/
public void init(IWorkbench workbench, IStructuredSelection selection) {
this.selection = selection;
-
+ if (selection == null) selection = new StructuredSelection();
}
public IPath getCreatedFilePath() {
16 years, 2 months
JBoss Tools SVN: r12817 - trunk/portlet/docs/reference/en/images/starting_project.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-24 03:40:58 -0500 (Wed, 24 Dec 2008)
New Revision: 12817
Added:
trunk/portlet/docs/reference/en/images/starting_project/starting_project_10.png
trunk/portlet/docs/reference/en/images/starting_project/starting_project_11.png
trunk/portlet/docs/reference/en/images/starting_project/starting_project_12.png
trunk/portlet/docs/reference/en/images/starting_project/starting_project_13.png
trunk/portlet/docs/reference/en/images/starting_project/starting_project_14.png
trunk/portlet/docs/reference/en/images/starting_project/starting_project_7.png
trunk/portlet/docs/reference/en/images/starting_project/starting_project_8.png
trunk/portlet/docs/reference/en/images/starting_project/starting_project_9.png
Log:
https://jira.jboss.org/jira/browse/JBDS-417 - adding the screenshots;
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_10.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_11.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_11.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_12.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_13.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_14.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_14.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_7.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_8.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/portlet/docs/reference/en/images/starting_project/starting_project_9.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/docs/reference/en/images/starting_project/starting_project_9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Tools SVN: r12816 - trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2008-12-23 22:45:30 -0500 (Tue, 23 Dec 2008)
New Revision: 12816
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties
Log:
[JBIDE-3399] add missing files to binary
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties 2008-12-23 16:53:44 UTC (rev 12815)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties 2008-12-24 03:45:30 UTC (rev 12816)
@@ -1,4 +1,7 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ resultfile/,\
+ testfile/,\
+ plugin.properties
16 years, 2 months
JBoss Tools SVN: r12815 - trunk/esb/docs/esb_ref_guide/en/images/esb_project.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-12-23 11:53:44 -0500 (Tue, 23 Dec 2008)
New Revision: 12815
Added:
trunk/esb/docs/esb_ref_guide/en/images/esb_project/20_classpath_container.png
Log:
https://jira.jboss.org/jira/browse/JBDS-468
Added: trunk/esb/docs/esb_ref_guide/en/images/esb_project/20_classpath_container.png
===================================================================
(Binary files differ)
Property changes on: trunk/esb/docs/esb_ref_guide/en/images/esb_project/20_classpath_container.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Tools SVN: r12814 - trunk/esb/docs/esb_ref_guide/en/images/esb_project.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-12-23 11:53:11 -0500 (Tue, 23 Dec 2008)
New Revision: 12814
Removed:
trunk/esb/docs/esb_ref_guide/en/images/esb_project/20_classpath_container.png
Log:
Deleted: trunk/esb/docs/esb_ref_guide/en/images/esb_project/20_classpath_container.png
===================================================================
(Binary files differ)
16 years, 2 months
JBoss Tools SVN: r12813 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu.
by jbosstools-commits＠lists.jboss.org
Author: izhukov
Date: 2008-12-23 06:21:46 -0500 (Tue, 23 Dec 2008)
New Revision: 12813
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
Log:
use standard string like "Copy", "Delete" constants from JFACE library
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2008-12-23 08:36:26 UTC (rev 12812)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2008-12-23 11:21:46 UTC (rev 12813)
@@ -16,6 +16,9 @@
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.text.TextUtilities;
+import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -68,9 +71,9 @@
public class MenuCreationHelper {
public static final String CUT_ACTION = "Cut";
- public static final String COPY_ACTION = "Copy";
+ public static final String COPY_ACTION = JFaceResources.getString("copy"); //$NON-NLS-1$
public static final String PASTE_ACTION = "Paste";
- public static final String DELETE_ACTION = "Delete";
+ public static final String DELETE_ACTION = JFaceResources.getString("Delete"); //$NON-NLS-1$
public static final String TEST_ACTION = "Test";
private VpeDomMapping domMapping = null;
16 years, 2 months
JBoss Tools SVN: r12812 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: ui/editors and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-12-23 03:36:26 -0500 (Tue, 23 Dec 2008)
New Revision: 12812
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/CustomGraphicalNodeEditPolicy.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/tools/TargetTreeDropTargetListener.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
Log:
check the connection
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-12-23 03:32:08 UTC (rev 12811)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-12-23 08:36:26 UTC (rev 12812)
@@ -31,14 +31,55 @@
*/
public class JavaBeanModelCommandProcessor implements ICommandProcessor {
- public void processEMFCommand(Command emfCommand,
+ public boolean processEMFCommand(Command emfCommand,
SmooksConfigurationFileGenerateContext context) {
+ return true;
}
- public void processGEFCommand(org.eclipse.gef.commands.Command gefCommand,
+ private boolean checkGEFCommand(
+ org.eclipse.gef.commands.Command gefCommand,
SmooksConfigurationFileGenerateContext context) {
+ if (CreateConnectionCommand.class.isAssignableFrom(gefCommand
+ .getClass())) {
+ CreateConnectionCommand command = (CreateConnectionCommand) gefCommand;
+ if (command.getSource() != null && command.getTarget() != null) {
+ Object m = command.getTarget();
+ Object s = command.getSource();
+ if (m instanceof AbstractStructuredDataModel
+ && s instanceof AbstractStructuredDataModel) {
+ Object source = ((AbstractStructuredDataModel) s)
+ .getReferenceEntityModel();
+ Object t = ((AbstractStructuredDataModel) m)
+ .getReferenceEntityModel();
+ if(source instanceof JavaBeanModel && t instanceof JavaBeanModel){
+ boolean sis = ((JavaBeanModel)source).isPrimitive();
+ boolean tis = ((JavaBeanModel)t).isPrimitive();
+ if( (sis && !tis) || (!sis && tis)){
+ return false;
+ }
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.ui.gef.commandprocessor.ICommandProcessor#
+ * processGEFCommand(org.eclipse.gef.commands.Command,
+ * org.jboss.tools.smooks
+ * .ui.modelparser.SmooksConfigurationFileGenerateContext)
+ */
+ public boolean processGEFCommand(
+ org.eclipse.gef.commands.Command gefCommand,
+ SmooksConfigurationFileGenerateContext context) {
Object source = null;
JavaBeanModel target = null;
+ if (!checkGEFCommand(gefCommand, context)) {
+ return false;
+ }
if (CreateConnectionCommand.class.isAssignableFrom(gefCommand
.getClass())) {
CreateConnectionCommand command = (CreateConnectionCommand) gefCommand;
@@ -73,6 +114,7 @@
compoundCommand.execute();
}
}
+ return true;
}
private void fillCreateParentLinkCommand(CompoundCommand compoundCommand,
@@ -99,6 +141,7 @@
private CreateConnectionCommand createParentLinkCommand(Object source,
JavaBeanModel target, SmooksConfigurationFileGenerateContext context) {
+ if(target == null) return null;
ITreeContentProvider sourceProvider = context.getSourceViewerProvider();
JavaBeanModel targetParent = target.getParent();
AbstractStructuredDataModel targetParentGraphModel = UIUtils
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-23 03:32:08 UTC (rev 12811)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-23 08:36:26 UTC (rev 12812)
@@ -1046,10 +1046,7 @@
if (dialog.open() == org.eclipse.jface.dialogs.Dialog.OK) {
sourceDataTypeID = wizard.getSourceDataTypeID();
targetDataTypeID = wizard.getTargetDataTypeID();
- // sourceTreeViewerInputModel = wizard
- // .getSourceTreeViewerInputContents();
- // targetTreeViewerInputModel = wizard
- // .getTargetTreeViewerInputContents();
+
SmooksConfigurationFileGenerateContext context = getSmooksConfigurationFileGenerateContext();
context.setSourceDataTypeID(sourceDataTypeID);
context.setTargetDataTypeID(targetDataTypeID);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java 2008-12-23 03:32:08 UTC (rev 12811)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java 2008-12-23 08:36:26 UTC (rev 12812)
@@ -68,7 +68,7 @@
return instance;
}
- public void processGEFCommand(Command command, EditPart editPart) throws CoreException {
+ public boolean processGEFCommand(Command command, EditPart editPart) throws CoreException {
if(editPart != null && editPart instanceof GraphicalEditPart){
DefaultEditDomain domain = (DefaultEditDomain)((GraphicalViewer)((GraphicalEditPart)editPart).getViewer()).getEditDomain();
IEditorPart pa = domain.getEditorPart();
@@ -77,18 +77,20 @@
if(page != null){
String sourceId = page.getSourceDataTypeID();
String targetId = page.getTargetDataTypeID();
- processGEFCommand(command, sourceId,targetId,page.getSmooksConfigurationFileGenerateContext());
+ return processGEFCommand(command, sourceId,targetId,page.getSmooksConfigurationFileGenerateContext());
}
}
}
+ return true;
}
- public void processGEFCommand(Command command, String sourceId,
+ public boolean processGEFCommand(Command command, String sourceId,
String targetId , SmooksConfigurationFileGenerateContext context) throws CoreException {
ICommandProcessor pro = getCommandProcessor(sourceId, targetId);
if (pro != null) {
- pro.processGEFCommand(command , context);
+ return pro.processGEFCommand(command , context);
}
+ return true;
}
public ICommandProcessor getCommandProcessor(String sourceId,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java 2008-12-23 03:32:08 UTC (rev 12811)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java 2008-12-23 08:36:26 UTC (rev 12812)
@@ -10,7 +10,7 @@
* @CreateTime Jul 22, 2008
*/
public interface ICommandProcessor {
- public void processGEFCommand(Command gefCommand , SmooksConfigurationFileGenerateContext context);
+ public boolean processGEFCommand(Command gefCommand , SmooksConfigurationFileGenerateContext context);
- public void processEMFCommand(org.eclipse.emf.common.command.Command emfCommand, SmooksConfigurationFileGenerateContext context);
+ public boolean processEMFCommand(org.eclipse.emf.common.command.Command emfCommand, SmooksConfigurationFileGenerateContext context);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/CustomGraphicalNodeEditPolicy.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/CustomGraphicalNodeEditPolicy.java 2008-12-23 03:32:08 UTC (rev 12811)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/CustomGraphicalNodeEditPolicy.java 2008-12-23 08:36:26 UTC (rev 12812)
@@ -29,8 +29,9 @@
}
command.setTarget(getHost().getModel());
try {
- CommandProcessorFactory.getInstance().processGEFCommand(command,
+ boolean cando = CommandProcessorFactory.getInstance().processGEFCommand(command,
getHost());
+ if(!cando) return null;
} catch (CoreException e) {
// ignore
}
@@ -46,8 +47,7 @@
EditPart childEditPart = (EditPart) iterator.next();
Object cm = childEditPart.getModel();
if (cm instanceof AbstractStructuredDataModel) {
- if (((AbstractStructuredDataModel) cm)
- .getReferenceEntityModel() == model) {
+ if (((AbstractStructuredDataModel) cm).getReferenceEntityModel() == model) {
resultEditPart = childEditPart;
break;
}
@@ -62,8 +62,9 @@
command.setSource(getHost().getModel());
request.setStartCommand(command);
try {
- CommandProcessorFactory.getInstance().processGEFCommand(command,
+ boolean cando = CommandProcessorFactory.getInstance().processGEFCommand(command,
getHost());
+ if(!cando) return null;
} catch (CoreException e) {
// ignore
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/tools/TargetTreeDropTargetListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/tools/TargetTreeDropTargetListener.java 2008-12-23 03:32:08 UTC (rev 12811)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/tools/TargetTreeDropTargetListener.java 2008-12-23 08:36:26 UTC (rev 12812)
@@ -71,7 +71,8 @@
Point p = hostViewer.getTree().toControl(
new Point(event.x, event.y));
TreeItem item = hostViewer.getTree().getItem(p);
- if(item == null) return;
+ if (item == null)
+ return;
Object model = item.getData();
SmooksCustomConnectionCreationTool tool = (SmooksCustomConnectionCreationTool) this
@@ -97,7 +98,7 @@
try {
Object source = TemplateTransfer.getInstance().getTemplate();
SmooksCustomConnectionCreationTool tool = (SmooksCustomConnectionCreationTool) this
- .getGraphicalViewer().getEditDomain().getActiveTool();
+ .getGraphicalViewer().getEditDomain().getActiveTool();
if (source == null) {
source = tool.getSourceModel();
}
@@ -105,22 +106,30 @@
if (item != null) {
Object target = item.getData();
if (source != null && target != null) {
- source = tool.findTheEditPart(source, this.getGraphicalViewer()).getModel();
- EditPart targetEditPart = tool.findTheEditPart(target, this.getGraphicalViewer());
+ source = tool.findTheEditPart(source,
+ this.getGraphicalViewer()).getModel();
+ EditPart targetEditPart = tool.findTheEditPart(target, this
+ .getGraphicalViewer());
target = targetEditPart.getModel();
CreateConnectionCommand command = new CreateConnectionCommand();
command.setSource(source);
command.setTarget(target);
- CommandStack stack = getGraphicalViewer().getEditDomain().getCommandStack();
+ CommandStack stack = getGraphicalViewer().getEditDomain()
+ .getCommandStack();
try {
- CommandProcessorFactory.getInstance().processGEFCommand(command, targetEditPart);
+ boolean cando = CommandProcessorFactory.getInstance()
+ .processGEFCommand(command, targetEditPart);
+ if (!cando)
+ return;
} catch (CoreException e) {
// ignore
}
stack.execute(command);
}
}
- } finally {
+ }catch(Throwable t){
+ t.printStackTrace();
+ }finally {
Tool dt = getGraphicalViewer().getEditDomain().getDefaultTool();
getGraphicalViewer().getEditDomain().setActiveTool(dt);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-12-23 03:32:08 UTC (rev 12811)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-12-23 08:36:26 UTC (rev 12812)
@@ -104,8 +104,14 @@
.getAbstractResourceConfig();
for (Iterator<AbstractResourceConfig> iterator = lists.iterator(); iterator
.hasNext();) {
- ResourceConfigType resourceConfig = (ResourceConfigType) iterator
+ AbstractResourceConfig resourceConfig1 = (AbstractResourceConfig) iterator
.next();
+ ResourceConfigType resourceConfig = null;
+ if(resourceConfig1 instanceof ResourceConfigType){
+ resourceConfig = (ResourceConfigType)resourceConfig1;
+ }else{
+ continue;
+ }
String selector = resourceConfig.getSelector();
UIUtils.checkSelector(selector);
List<Object> list = SmooksModelUtils
16 years, 2 months
JBoss Tools SVN: r12811 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-12-22 22:32:08 -0500 (Mon, 22 Dec 2008)
New Revision: 12811
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
Log:
addition of script task, esb task and human task support
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-23 03:28:50 UTC (rev 12810)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-23 03:32:08 UTC (rev 12811)
@@ -127,6 +127,30 @@
</node>
</element>
<element
+ class="org.jboss.tools.flow.jpdl4.model.ScriptTask"
+ id="org.jboss.tools.flow.jpdl4.scriptTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.ServiceTask"
+ id="org.jboss.tools.flow.jpdl4.serviceTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.HumanTask"
+ id="org.jboss.tools.flow.jpdl4.humanTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
class="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway"
id="org.jboss.tools.flow.jpdl4.exclusiveGateway"
language="org.jboss.tools.flow.jpdl4">
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-12-23 03:28:50 UTC (rev 12810)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-12-23 03:32:08 UTC (rev 12811)
@@ -126,6 +126,12 @@
result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.sqlTask");
} else if ("java".equals(child.getNodeName())) {
result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.javaTask");
+ } else if ("script".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.scriptTask");
+ } else if ("esb".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.serviceTask");
+ } else if ("task".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.humanTask");
} else if ("exclusive".equals(child.getNodeName())) {
result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.exclusiveGateway");
} else if ("join".equals(child.getNodeName())) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-23 03:28:50 UTC (rev 12810)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-23 03:32:08 UTC (rev 12811)
@@ -66,7 +66,7 @@
protected List<PaletteEntry> createEventEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
- "Start Event",
+ "Start",
"Create a new Start Event",
"org.jboss.tools.flow.jpdl4.startEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.startEvent"),
@@ -75,7 +75,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Terminate End Event",
+ "Terminate",
"Create a new terminating end event",
"org.jboss.tools.flow.jpdl4.terminateEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.terminateEndEvent"),
@@ -84,7 +84,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Cancel End Event",
+ "Cancel",
"Create a new cancel end event",
"org.jboss.tools.flow.jpdl4.cancelEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.cancelEndEvent"),
@@ -93,7 +93,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Error End Event",
+ "Error",
"Create a new error end event",
"org.jboss.tools.flow.jpdl4.errorEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.errorEndEvent"),
@@ -107,7 +107,7 @@
protected List<PaletteEntry> createTaskEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
- "Wait State Task",
+ "Wait",
"Create a new Wait State Task",
"org.jboss.tools.flow.jpdl4.waitTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.waitTask"),
@@ -116,7 +116,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "HQL Task",
+ "HQL",
"Create a new HQL Task",
"org.jboss.tools.flow.jpdl4.hqlTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.hqlTask"),
@@ -125,7 +125,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "SQL Task",
+ "SQL",
"Create a new SQL Task",
"org.jboss.tools.flow.jpdl4.sqlTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sqlTask"),
@@ -134,7 +134,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Java Task",
+ "Java",
"Create a new Java Task",
"org.jboss.tools.flow.jpdl4.javaTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.javaTask"),
@@ -142,6 +142,33 @@
ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_java.png"))
);
entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "Script",
+ "Create a new Script Task",
+ "org.jboss.tools.flow.jpdl4.scriptTask",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.scriptTask"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png"))
+ );
+ entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "ESB",
+ "Create a new Service Task",
+ "org.jboss.tools.flow.jpdl4.serviceTask",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.serviceTask"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png"))
+ );
+ entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "Task",
+ "Create a new Human Task",
+ "org.jboss.tools.flow.jpdl4.humanTask",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.humanTask"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png"))
+ );
+ entries.add(combined);
return entries;
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-23 03:28:50 UTC (rev 12810)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-23 03:32:08 UTC (rev 12811)
@@ -18,10 +18,13 @@
import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway;
import org.jboss.tools.flow.jpdl4.model.ForkParallelGateway;
import org.jboss.tools.flow.jpdl4.model.HqlTask;
+import org.jboss.tools.flow.jpdl4.model.HumanTask;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
import org.jboss.tools.flow.jpdl4.model.JoinParallelGateway;
import org.jboss.tools.flow.jpdl4.model.Process;
+import org.jboss.tools.flow.jpdl4.model.ScriptTask;
import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
+import org.jboss.tools.flow.jpdl4.model.ServiceTask;
import org.jboss.tools.flow.jpdl4.model.SqlTask;
import org.jboss.tools.flow.jpdl4.model.StartEvent;
import org.jboss.tools.flow.jpdl4.model.SuperState;
@@ -166,6 +169,39 @@
buffer.append("name=\"" + value + "\"");
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof ScriptTask) {
+ ScriptTask scriptTask = (ScriptTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<script");
+ if (!isEmpty(scriptTask.getName())) {
+ buffer.append(" ");
+ String value = scriptTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof ServiceTask) {
+ ServiceTask serviceTask = (ServiceTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<esb");
+ if (!isEmpty(serviceTask.getName())) {
+ buffer.append(" ");
+ String value = serviceTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof HumanTask) {
+ HumanTask humanTask = (HumanTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<task");
+ if (!isEmpty(humanTask.getName())) {
+ buffer.append(" ");
+ String value = humanTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
} else if (element instanceof ExclusiveGateway) {
ExclusiveGateway exclusiveGateway = (ExclusiveGateway)element;
buffer.append("\n");
@@ -271,6 +307,18 @@
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</java>");
+ } else if (element instanceof ScriptTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</script>");
+ } else if (element instanceof ServiceTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</esb>");
+ } else if (element instanceof HumanTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</task>");
} else if (element instanceof ExclusiveGateway) {
buffer.append("\n");
appendPadding(buffer, level);
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2008-12-23 03:32:08 UTC (rev 12811)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class HumanTask extends Task {
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java 2008-12-23 03:32:08 UTC (rev 12811)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class ScriptTask extends Task {
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.java 2008-12-23 03:32:08 UTC (rev 12811)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class ServiceTask extends Task {
+
+}
16 years, 2 months