Index: configure.ac =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/configure.ac,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 configure.ac --- configure.ac 9 May 2005 02:36:56 -0000 1.3 +++ configure.ac 16 May 2005 18:06:43 -0000 @@ -5,7 +5,7 @@ AC_INIT([CASheW-s Editor],[0.00+cvs],[ca AC_CONFIG_SRCDIR(src/nongnu/cashews/rdf/XMLParser.java) dnl Initialise automake -AM_INIT_AUTOMAKE(cashew-s-editor, 0.00+cvs) +AM_INIT_AUTOMAKE(cashew-s-editor, 0.01) dnl Require at least version 2.59 AC_PREREQ(2.59) Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/lib/Makefile.am,v retrieving revision 1.9 diff -u -3 -p -u -r1.9 Makefile.am --- lib/Makefile.am 9 May 2005 20:01:06 -0000 1.9 +++ lib/Makefile.am 16 May 2005 18:06:43 -0000 @@ -160,7 +160,7 @@ compile-classes: classes $(JAVA_SRCS) Ma $(JAVAC) touch compile-classes -EXTRA_DIST = standard.omit mkcollections.pl.in +EXTRA_DIST = standard.omit CLEANFILES = compile-classes resources classes \ cashews.jar classes.1 \ $(JAVA_DEPEND) @@ -170,11 +170,12 @@ clean-local: dist-hook: mkdir -p $(distdir) - cp -dfR $(top_srcdir)/nongnu $(top_distdir) + cp -dfR $(top_srcdir)/src $(top_distdir) # Delete not wanted files. - $(FIND) $(top_distdir)/nongnu -name CVS -print | xargs rm -fr - $(FIND) $(top_distdir)/nongnu -name .cvsignore -print | xargs rm -f - $(FIND) $(top_distdir)/nongnu -name class-dependencies.conf -print | xargs rm -f + $(FIND) $(top_distdir) -name CVS -print | xargs rm -fr + $(FIND) $(top_distdir) -name .cvsignore -print | xargs rm -f + $(FIND) $(top_distdir) -name class-dependencies.conf -print | xargs rm -f + rm -f $(top_distdir)/src/nongnu/cashews/commons/Configuration.java # Omit files listed in standard.omit. ( cd $(top_distdir)/lib ; cat $(top_builddir)/lib/standard.omit | sed -e 's/\$$//' | sed -e 's/\/\.\*//' | xargs rm -fr ) Index: src/nongnu/cashews/eclipse/composer/dnd/DiagramTemplateTransferDropTargetListener.java =================================================================== RCS file: src/nongnu/cashews/eclipse/composer/dnd/DiagramTemplateTransferDropTargetListener.java diff -N src/nongnu/cashews/eclipse/composer/dnd/DiagramTemplateTransferDropTargetListener.java --- src/nongnu/cashews/eclipse/composer/dnd/DiagramTemplateTransferDropTargetListener.java 31 Mar 2005 17:35:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,62 +0,0 @@ -/* DiagramTemplateTransferDropTargetListener.java -- Event handler. - Copyright (C) 2005 The University of Sheffield. - -This file is part of the CASheW-s editor Eclipse plug-in. - -The CASheW-s editor Eclipse plug-in is free software; you may copy, modify, -and redistribute it under the terms of the GNU General Public License -version 2 (or, at your option, any later version), and/or the Eclipse -Public License version 1.0. - -The CASheW-s editor is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with The CASheW-s editor; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. - -The University of Sheffield makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to -you under the terms and conditions of the Eclipse Public License Version -1.0 ("EPL"). A copy of the EPL is available at -http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, -"Program" will mean the Content. - -If you did not receive this Content directly from the University of Sheffield, -the Content is being redistributed by another party ("Redistributor") and -different terms and conditions may apply to your use of any object code in -the Content. Check the Redistributor's license that was provided with the -Content. If no such license exists, contact the Redistributor. Unless -otherwise indicated below, the terms and conditions of the EPL still apply -to any source code in the Content. - -*/ - -package nongnu.cashews.eclipse.composer.dnd; - -import nongnu.cashews.eclipse.composer.model.ElementFactory; - -import org.eclipse.gef.EditPartViewer; -import org.eclipse.gef.dnd.TemplateTransferDropTargetListener; -import org.eclipse.gef.requests.CreationFactory; - -public class DiagramTemplateTransferDropTargetListener extends - TemplateTransferDropTargetListener -{ - - public DiagramTemplateTransferDropTargetListener(EditPartViewer viewer) - { - super(viewer); - } - - // ------------------------------------------------------------------------ - // Abstract methods from TemplateTransferDropTargetListener - - protected CreationFactory getFactory(Object template) - { - return new ElementFactory(template); - } -} Index: src/nongnu/cashews/eclipse/composer/ui/DiagramEditor.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/eclipse/composer/ui/DiagramEditor.java,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 DiagramEditor.java --- src/nongnu/cashews/eclipse/composer/ui/DiagramEditor.java 5 May 2005 23:47:59 -0000 1.2 +++ src/nongnu/cashews/eclipse/composer/ui/DiagramEditor.java 16 May 2005 18:06:43 -0000 @@ -42,6 +42,7 @@ import java.util.EventObject; import nongnu.cashews.eclipse.composer.dnd.DiagramTemplateTransferDropTargetListener; import nongnu.cashews.eclipse.composer.model.Diagram; +import nongnu.cashews.eclipse.composer.model.ElementFactory; import nongnu.cashews.eclipse.composer.parts.PartFactory; import nongnu.cashews.eclipse.composer.parts.TreePartFactory; @@ -56,8 +57,10 @@ import org.eclipse.gef.DefaultEditDomain import org.eclipse.gef.KeyHandler; import org.eclipse.gef.KeyStroke; import org.eclipse.gef.dnd.TemplateTransferDragSourceListener; +import org.eclipse.gef.dnd.TemplateTransferDropTargetListener; import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.gef.palette.PaletteRoot; +import org.eclipse.gef.requests.CreationFactory; import org.eclipse.gef.ui.actions.ActionRegistry; import org.eclipse.gef.ui.actions.GEFActionConstants; import org.eclipse.gef.ui.parts.ContentOutlinePage; @@ -190,8 +193,13 @@ public class DiagramEditor extends Graph getGraphicalViewer().setContents(this.diagram); getGraphicalViewer().addDropTargetListener( - new DiagramTemplateTransferDropTargetListener( - getGraphicalViewer())); + new TemplateTransferDropTargetListener(getGraphicalViewer()) + { + protected CreationFactory getFactory(Object template) + { + return new ElementFactory(template); + } + }); } // ------------------------------------------------------------------------ Index: src/nongnu/cashews/eclipse/gui/Cashews.java =================================================================== RCS file: /cvsroot/cashew-s-editor/cashews/src/nongnu/cashews/eclipse/gui/Cashews.java,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 Cashews.java --- src/nongnu/cashews/eclipse/gui/Cashews.java 13 May 2005 01:46:42 -0000 1.2 +++ src/nongnu/cashews/eclipse/gui/Cashews.java 16 May 2005 18:06:43 -0000 @@ -21,6 +21,13 @@ package nongnu.cashews.eclipse.gui; +import java.net.URI; + +import nongnu.cashews.language.grounding.SoapOperation; +import static nongnu.cashews.services.Processes.TEST_COMPOSITE_SEQUENCE; +import nongnu.cashews.services.WorkflowService; +import nongnu.cashews.soap.SoapClient; + import org.eclipse.jface.window.ApplicationWindow; import org.eclipse.jface.wizard.WizardDialog; @@ -60,14 +67,21 @@ public class Cashews button.setText("Create a composite process"); button.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) + public void widgetSelected(SelectionEvent event) { CashewsWizard wizard = new CashewsWizard(); new WizardDialog(getShell(), wizard).open(); - SoapClient client = new SoapClient(); - SoapOperation operation = getService(); - client.call(operation, new URI("testWorkflow3"), - TEST_COMPOSITE_SEQUENCE); + try + { + SoapClient client = new SoapClient(); + SoapOperation operation = WorkflowService.getService(); + client.call(operation, new URI("testWorkflow3"), + TEST_COMPOSITE_SEQUENCE); + } + catch (Exception e) + { + e.printStackTrace(); + } } }); return button;