August 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r24196 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-16 17:53:58 -0400 (Mon, 16 Aug 2010) New Revision: 24196 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java Log: 2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (buildHardwareProfile): Remove extraneous statements that cause unused warning. * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java: Remove extraneous import that causes warning. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-16 21:51:27 UTC (rev 24195) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-16 21:53:58 UTC (rev 24196) @@ -1,5 +1,12 @@ 2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (buildHardwareProfile): Remove + extraneous statements that cause unused warning. + * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java: Remove extraneous import + that causes warning. + +2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> + * META-INF/MANIFEST.MF: Add dependency on org.eclipse.equinox.security. * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Store the password for the cloud using Secure Preferences using the cloud's url Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-16 21:51:27 UTC (rev 24195) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-16 21:53:58 UTC (rev 24196) @@ -5,7 +5,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.net.MalformedURLException; import java.util.ArrayList; import javax.xml.parsers.DocumentBuilder; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-16 21:51:27 UTC (rev 24195) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-16 21:53:58 UTC (rev 24196) @@ -332,8 +332,6 @@ for (int j = 0; j < enumChildren.getLength(); ++j) { Node enumChild = enumChildren.item(j); if (enumChild.getNodeName().equals("entry")) { - NamedNodeMap attrs = enumChild.getAttributes(); - Node x = attrs.getNamedItem("value"); enums.add(enumChild.getAttributes().getNamedItem("value").getNodeValue()); //$NON-NLS-1$ } }

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24195 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-16 17:51:27 -0400 (Mon, 16 Aug 2010) New Revision: 24195 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java Log: 2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Add Instances view to perspective and specify it appears on the bottom. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-16 21:20:26 UTC (rev 24194) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-16 21:51:27 UTC (rev 24195) @@ -1,5 +1,10 @@ 2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Add + Instances view to perspective and specify it appears on the bottom. + +2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (changeEvent): Check if there any clouds and that there is a current cloud before referencing anything. If it turns out there are no longer any clouds, set the input to an empty list of Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java 2010-08-16 21:20:26 UTC (rev 24194) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java 2010-08-16 21:51:27 UTC (rev 24195) @@ -11,6 +11,8 @@ 0.25f, IPageLayout.ID_EDITOR_AREA); layout.addView(IPageLayout.ID_PROP_SHEET, IPageLayout.BOTTOM, 0.80f, IPageLayout.ID_EDITOR_AREA); + layout.addView("org.jboss.tools.deltacloud.ui.views.InstanceView", IPageLayout.BOTTOM, + 0.80f, IPageLayout.ID_EDITOR_AREA); } }

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24194 - in branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl: META-INF and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-08-16 17:20:26 -0400 (Mon, 16 Aug 2010) New Revision: 24194 Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml Log: JBIDE-6649 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2010-08-16 20:57:44 UTC (rev 24193) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2010-08-16 21:20:26 UTC (rev 24194) @@ -68,6 +68,9 @@ org.eclipse.core.variables, org.junit, org.eclipse.ui.views.properties.tabbed, - org.jboss.tools.jbpm.common + org.jboss.tools.jbpm.common, + org.eclipse.ui.navigator, + org.eclipse.ltk.ui.refactoring, + org.eclipse.ltk.core.refactoring Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml 2010-08-16 20:57:44 UTC (rev 24193) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml 2010-08-16 21:20:26 UTC (rev 24194) @@ -1577,10 +1577,29 @@ <extension point="org.eclipse.ui.startup"> <startup class="org.jbpm.gd.jpdl.StartupClass"/> </extension> - + <extension point="org.eclipse.core.runtime.preferences"> <initializer class="org.jbpm.gd.jpdl.prefs.Initializer"/> </extension> + <extension + point="org.eclipse.ui.handlers"> + <handler + class="org.jbpm.gd.jpdl.refactoring.RenameProcessHandler" + commandId="org.eclipse.ltk.ui.refactoring.commands.renameResource"> + <activeWhen> + <iterate> + <and> + <instanceof value="org.eclipse.core.resources.IResource" /> + <or> + <test property="org.eclipse.core.resources.name" value="*.jpdl.xml" /> + <test property="org.eclipse.core.resources.name" value="*.gpd.xml" /> + </or> + </and> + </iterate> + </activeWhen> + </handler> + </extension> + </plugin> Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java 2010-08-16 21:20:26 UTC (rev 24194) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2007, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * IBM Corporation - initial API and implementation + ******************************************************************************/ +package org.jbpm.gd.jpdl.refactoring; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.mapping.ResourceMapping; +import org.eclipse.core.resources.mapping.ResourceMappingContext; +import org.eclipse.core.resources.mapping.ResourceTraversal; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IAdapterManager; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.jbpm.gd.jpdl.Logger; + +public abstract class AbstractProcessHandler extends AbstractHandler { + + protected IResource[] getSelectedResources(IStructuredSelection sel) { + List resources= new ArrayList(sel.size()); + for (Iterator e= sel.iterator(); e.hasNext();) { + Object next= e.next(); + if (next instanceof IResource) { + resources.add(next); + continue; + } else if (next instanceof IAdaptable) { + Object resource= ((IAdaptable) next).getAdapter(IResource.class); + if (resource != null) { + resources.add(resource); + continue; + } + } else { + IAdapterManager adapterManager= Platform.getAdapterManager(); + ResourceMapping mapping= (ResourceMapping) adapterManager.getAdapter(next, ResourceMapping.class); + + if (mapping != null) { + + ResourceTraversal[] traversals= null; + try { + traversals= mapping.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, new NullProgressMonitor()); + } catch (CoreException exception) { + Logger.log(exception.getStatus()); + } + + if (traversals != null) { + for (int i= 0; i < traversals.length; i++) { + IResource[] traversalResources= traversals[i].getResources(); + if (traversalResources != null) { + for (int j= 0; j < traversalResources.length; j++) { + resources.add(traversalResources[j]); + }// for + }// if + }// for + }// if + }// if + } + } + return (IResource[]) resources.toArray(new IResource[resources.size()]); + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java 2010-08-16 21:20:26 UTC (rev 24194) @@ -0,0 +1,13 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; + +public class DeleteProcessHandler extends AbstractProcessHandler { + + public Object execute(ExecutionEvent arg0) throws ExecutionException { + System.out.println("hello, delete world"); + return null; + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java 2010-08-16 21:20:26 UTC (rev 24194) @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2003, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.jdt.ui.actions.RefactorActionGroup; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.actions.ActionContext; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; + +/** + * Contributes the following actions to the menu on behalf of the JDT content + * extension. + * + * <ul> + * <li>{@link RefactorActionGroup}. Contributes the "Refactor>" and "Source>" submenus to the context menu.</li> + * </ul> + */ +public class JavaNavigatorRefactorActionProvider extends CommonActionProvider { + + private RefactorActionGroup fRefactorGroup; + + public void fillActionBars(IActionBars actionBars) { + if (fRefactorGroup != null) { + fRefactorGroup.fillActionBars(actionBars); + fRefactorGroup.retargetFileMenuActions(actionBars); + } + } + + public void fillContextMenu(IMenuManager menu) { + if (fRefactorGroup != null) { + fRefactorGroup.fillContextMenu(menu); + } + } + + public void init(ICommonActionExtensionSite site) { + ICommonViewerWorkbenchSite workbenchSite= null; + if (site.getViewSite() instanceof ICommonViewerWorkbenchSite) + workbenchSite= (ICommonViewerWorkbenchSite) site.getViewSite(); + + // we only initialize the refactor group when in a view part + // (required for the constructor) + if (workbenchSite != null) { + if (workbenchSite.getPart() != null && workbenchSite.getPart() instanceof IViewPart) { + IViewPart viewPart= (IViewPart) workbenchSite.getPart(); + + fRefactorGroup= new RefactorActionGroup(viewPart); + } + } + } + + public void setContext(ActionContext context) { + if (fRefactorGroup != null) { + fRefactorGroup.setContext(context); + } + } + + /* + * @see org.eclipse.ui.actions.ActionGroup#dispose() + * @since 3.5 + */ + public void dispose() { + if (fRefactorGroup != null) + fRefactorGroup.dispose(); + super.dispose(); + } +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java 2010-08-16 21:20:26 UTC (rev 24194) @@ -0,0 +1,13 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; + +public class MoveProcessHandler extends AbstractProcessHandler { + + public Object execute(ExecutionEvent arg0) throws ExecutionException { + System.out.println("hello, move world"); + return null; + } + +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java 2010-08-16 21:20:26 UTC (rev 24194) @@ -0,0 +1,39 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.handlers.HandlerUtil; + +public class RenameProcessHandler extends AbstractProcessHandler { + + public Object execute(ExecutionEvent event) throws ExecutionException { + Shell activeShell= HandlerUtil.getActiveShell(event); + ISelection sel= HandlerUtil.getCurrentSelection(event); + if (sel instanceof IStructuredSelection) { + IResource resource= getCurrentResource((IStructuredSelection) sel); + if (resource != null) { + RenameProcessWizard refactoringWizard= new RenameProcessWizard(resource); + RefactoringWizardOpenOperation op= new RefactoringWizardOpenOperation(refactoringWizard); + try { + op.run(activeShell, "Rename Process"); + } catch (InterruptedException e) { + // do nothing + } + } + } + return null; + } + + private IResource getCurrentResource(IStructuredSelection sel) { + IResource[] resources= getSelectedResources(sel); + if (resources.length == 1) { + return resources[0]; + } + return null; + } +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java 2010-08-16 21:20:26 UTC (rev 24194) @@ -0,0 +1,239 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceStatus; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant; +import org.eclipse.ltk.core.refactoring.participants.RenameProcessor; +import org.eclipse.ltk.core.refactoring.participants.ResourceChangeChecker; +import org.eclipse.ltk.core.refactoring.participants.SharableParticipants; +import org.eclipse.ltk.core.refactoring.resource.RenameResourceChange; + +public class RenameProcessProcessor extends RenameProcessor { + + private IResource jpdlResource; + private IResource gpdResource; + private String newProcessName; + private boolean updateReferences; + + public RenameProcessProcessor(IResource resource) { + if (resource == null || !resource.exists()) { + throw new IllegalArgumentException("resource must not be null and must exist"); //$NON-NLS-1$ + } + + if (isJpdlFile(resource)) { + jpdlResource = resource; + gpdResource = getGpdResource(resource); + } else if (isGpdFile(resource)) { + jpdlResource = getJpdlResource(resource); + gpdResource = resource; + } + + if (jpdlResource != null && jpdlResource.exists() && gpdResource != null && gpdResource.exists()) { + + updateReferences= true; + + String newName = jpdlResource.getName(); + int i = newName.indexOf(".jpdl.xml"); + if (i != -1) { + newName = newName.substring(0, i); + } + setNewProcessName(newName); + + } else { + throw new IllegalArgumentException("both jpdlFile and gpdFile must not be null and must exist"); + } + } + + private String getProcessName(IResource resource) { + String name = resource.getName(); + if (name.startsWith(".") && name.endsWith(".gpd.xml")) { + return name.substring(1, name.indexOf(".gpd.xml")); + } else if (name.endsWith(".jpdl.xml")) { + return name.substring(0, name.indexOf(".jpdl.xml")); + } else { + throw new IllegalArgumentException("resource must be either a jpdlFile or gpdFile"); + } + } + + private boolean isJpdlFile(IResource resource) { + return resource.getName().endsWith(".jpdl.xml"); + } + + private boolean isGpdFile(IResource resource) { + String name = resource.getName(); + return name.startsWith(".") && name.endsWith(".gpd.xml"); + } + + private IResource getGpdResource(IResource resource) { + if (!resource.getName().endsWith(".jpdl.xml")) { + throw new IllegalArgumentException("gpd resource can only be obtained for a jpdl file"); + } + return resource.getParent().getFile(new Path("." + getProcessName(resource) + ".gpd.xml")); + } + + private IResource getJpdlResource(IResource resource) { + if (!resource.getName().endsWith(".gpd.xml")) { + throw new IllegalArgumentException("jpdl resource can only be obtained for a gpd file"); + } + return resource.getParent().getFile(new Path(getProcessName(resource) + ".jpdl.xml")); + } + + public String getNewProcessName() { + return newProcessName; + } + + public void setNewProcessName(String newName) { + Assert.isNotNull(newName); + newProcessName= newName; + } + + public boolean isUpdateReferences() { + return updateReferences; + } + + public void setUpdateReferences(boolean updateReferences) { + this.updateReferences= updateReferences; + } + + public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException { + IStatus result = null; + if (!jpdlResource.isSynchronized(IResource.DEPTH_INFINITE)) { + result = new Status ( + IStatus.ERROR, + ResourcesPlugin.PI_RESOURCES, + IResourceStatus.OUT_OF_SYNC_LOCAL, + "Resource " + jpdlResource.getName() + "is out of sync with file system", + null); + } + if (!gpdResource.isSynchronized(IResource.DEPTH_INFINITE)) { + IStatus temp = new Status ( + IStatus.ERROR, + ResourcesPlugin.PI_RESOURCES, + IResourceStatus.OUT_OF_SYNC_LOCAL, + "Resource " + jpdlResource.getName() + "is out of sync with file system", + null); + if (result == null) { + result = temp; + } else { + MultiStatus multi = new MultiStatus( + ResourcesPlugin.PI_RESOURCES, + IResourceStatus.OUT_OF_SYNC_LOCAL, + "both resources are out of sync with file system", + null); + multi.add(result); + multi.add(temp); + result = multi; + } + } + if (result == null) { + result = Status.OK_STATUS; + } + return RefactoringStatus.create(result); + } + + public RefactoringStatus checkFinalConditions(IProgressMonitor pm, CheckConditionsContext context) throws CoreException { + pm.beginTask("", 1); + try { + ResourceChangeChecker checker= (ResourceChangeChecker) context.getChecker(ResourceChangeChecker.class); + IResourceChangeDescriptionFactory deltaFactory= checker.getDeltaFactory(); + IPath newJpdlPath= jpdlResource.getFullPath().removeLastSegments(1).append(getNewProcessName() + ".jpdl.xml"); + deltaFactory.move( + jpdlResource, newJpdlPath); + IPath newGpdPath= gpdResource.getFullPath().removeLastSegments(1).append("." + getNewProcessName() + ".gpd.xml"); + deltaFactory.move( + gpdResource, newGpdPath); + return new RefactoringStatus(); + } finally { + pm.done(); + } + } + + public RefactoringStatus validateNewElementName(String newName) { + Assert.isNotNull(newName, "new name"); + IContainer c= jpdlResource.getParent(); + if (c == null) + return RefactoringStatus.createFatalErrorStatus("Internal Error"); + if ("".equals(newName)) { + return RefactoringStatus.createFatalErrorStatus("The name of the process cannot be the empty string"); + } + if (c.findMember(newName + ".jpdl.xml") != null || c.findMember("." + newName + ".gpd.xml") != null) + return RefactoringStatus.createFatalErrorStatus("A process with this name already exists"); + + if (!c.getFullPath().isValidSegment(newName + ".jpdl.xml") || !c.getFullPath().isValidSegment("." + newName + ".gpd.xml")) + return RefactoringStatus.createFatalErrorStatus("This is an invalid name for a process"); + + RefactoringStatus result= RefactoringStatus.create(c.getWorkspace().validateName(newName, jpdlResource.getType())); + if (!result.hasFatalError()) { + result.merge(RefactoringStatus.create(c.getWorkspace().validateName(newName, gpdResource.getType()))); + } + if (!result.hasFatalError()) + result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(jpdlResource, newName), jpdlResource.getType()))); + if (!result.hasFatalError()) + result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(gpdResource, newName), gpdResource.getType()))); + return result; + } + + public Change createChange(IProgressMonitor pm) throws CoreException { + pm.beginTask("", 1); + try { + CompositeChange compositeChange = new CompositeChange("process rename"); + compositeChange.add(new RenameResourceChange(jpdlResource.getFullPath(), getNewProcessName() + ".jpdl.xml")); + compositeChange.add(new RenameResourceChange(gpdResource.getFullPath(), "." + getNewProcessName() + ".gpd.xml")); + return compositeChange; + } finally { + pm.done(); + } + } + + private String createNewPath(IResource resource, String newName) { + return resource.getFullPath().removeLastSegments(1).append(newName).toString(); + } + + public Object[] getElements() { + return new Object[] { jpdlResource, gpdResource}; + } + + public String getIdentifier() { + return "org.jbpm.gd.jpdl.refactoring.renameProcessProcessor"; + } + + public String getProcessorName() { + return "Rename Process"; + } + + public boolean isApplicable() { + if (jpdlResource == null) + return false; + if (!jpdlResource.exists()) + return false; + if (!jpdlResource.isAccessible()) + return false; + if (gpdResource == null) + return false; + if (!gpdResource.exists()) + return false; + if (!gpdResource.isAccessible()) + return false; + return true; + } + + public RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants shared) throws CoreException { + return new RefactoringParticipant[0]; + } + +} \ No newline at end of file Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java (rev 0) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java 2010-08-16 21:20:26 UTC (rev 24194) @@ -0,0 +1,98 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; +import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; + +public class RenameProcessWizard extends RefactoringWizard { + + public RenameProcessWizard(IResource resource) { + super(new RenameRefactoring(new RenameProcessProcessor(resource)), DIALOG_BASED_USER_INTERFACE); + setDefaultPageTitle("Rename Process"); + setWindowTitle("Rename Process"); + } + + protected void addUserInputPages() { + RenameProcessProcessor processor= (RenameProcessProcessor) getRefactoring().getAdapter(RenameProcessProcessor.class); + addPage(new RenameProcessRefactoringConfigurationPage(processor)); + } + + private static class RenameProcessRefactoringConfigurationPage extends UserInputWizardPage { + + private final RenameProcessProcessor refactoringProcessor; + private Text nameField; + + public RenameProcessRefactoringConfigurationPage(RenameProcessProcessor processor) { + super("RenameResourceRefactoringInputPage"); + refactoringProcessor= processor; + } + + public void createControl(Composite parent) { + Composite composite= new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout(2, false)); + composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + composite.setFont(parent.getFont()); + + Label label= new Label(composite, SWT.NONE); + label.setText("New na&me"); + label.setLayoutData(new GridData()); + + nameField= new Text(composite, SWT.BORDER); + nameField.setText(refactoringProcessor.getNewProcessName()); + nameField.setFont(composite.getFont()); + nameField.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false)); + nameField.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + validatePage(); + } + }); + + nameField.selectAll(); + setPageComplete(false); + setControl(composite); + } + + public void setVisible(boolean visible) { + if (visible) { + nameField.setFocus(); + } + super.setVisible(visible); + } + + protected final void validatePage() { + String text= nameField.getText(); + RefactoringStatus status= refactoringProcessor.validateNewElementName(text); + setPageComplete(status); + } + + protected boolean performFinish() { + initializeRefactoring(); + storeSettings(); + return super.performFinish(); + } + + public IWizardPage getNextPage() { + initializeRefactoring(); + storeSettings(); + return super.getNextPage(); + } + + private void storeSettings() { + } + + private void initializeRefactoring() { + refactoringProcessor.setNewProcessName(nameField.getText()); + } + } +} Property changes on: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24193 - in trunk/jbpm/plugins/org.jbpm.gd.jpdl: META-INF and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-08-16 16:57:44 -0400 (Mon, 16 Aug 2010) New Revision: 24193 Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml Log: JBIDE-6649 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2010-08-16 20:55:22 UTC (rev 24192) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2010-08-16 20:57:44 UTC (rev 24193) @@ -68,6 +68,9 @@ org.eclipse.core.variables, org.junit, org.eclipse.ui.views.properties.tabbed, - org.jboss.tools.jbpm.common + org.jboss.tools.jbpm.common, + org.eclipse.ui.navigator, + org.eclipse.ltk.ui.refactoring;bundle-version="3.5.0", + org.eclipse.ltk.core.refactoring;bundle-version="3.5.100" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml 2010-08-16 20:55:22 UTC (rev 24192) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml 2010-08-16 20:57:44 UTC (rev 24193) @@ -1577,9 +1577,75 @@ <extension point="org.eclipse.ui.startup"> <startup class="org.jbpm.gd.jpdl.StartupClass"/> </extension> + <extension point="org.eclipse.core.runtime.preferences"> <initializer class="org.jbpm.gd.jpdl.prefs.Initializer"/> + </extension> + + <extension + point="org.eclipse.ui.handlers"> + <handler + class="org.jbpm.gd.jpdl.refactoring.RenameProcessHandler" + commandId="org.eclipse.ltk.ui.refactoring.commands.renameResource"> + <activeWhen> + <iterate> + <and> + <instanceof value="org.eclipse.core.resources.IResource" /> + <or> + <test property="org.eclipse.core.resources.name" value="*.jpdl.xml" /> + <test property="org.eclipse.core.resources.name" value="*.gpd.xml" /> + </or> + </and> + </iterate> + </activeWhen> + </handler> + </extension> + + </plugin> Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java 2010-08-16 20:57:44 UTC (rev 24193) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2007, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * IBM Corporation - initial API and implementation + ******************************************************************************/ +package org.jbpm.gd.jpdl.refactoring; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.mapping.ResourceMapping; +import org.eclipse.core.resources.mapping.ResourceMappingContext; +import org.eclipse.core.resources.mapping.ResourceTraversal; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IAdapterManager; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.jbpm.gd.jpdl.Logger; + +public abstract class AbstractProcessHandler extends AbstractHandler { + + protected IResource[] getSelectedResources(IStructuredSelection sel) { + List resources= new ArrayList(sel.size()); + for (Iterator e= sel.iterator(); e.hasNext();) { + Object next= e.next(); + if (next instanceof IResource) { + resources.add(next); + continue; + } else if (next instanceof IAdaptable) { + Object resource= ((IAdaptable) next).getAdapter(IResource.class); + if (resource != null) { + resources.add(resource); + continue; + } + } else { + IAdapterManager adapterManager= Platform.getAdapterManager(); + ResourceMapping mapping= (ResourceMapping) adapterManager.getAdapter(next, ResourceMapping.class); + + if (mapping != null) { + + ResourceTraversal[] traversals= null; + try { + traversals= mapping.getTraversals(ResourceMappingContext.LOCAL_CONTEXT, new NullProgressMonitor()); + } catch (CoreException exception) { + Logger.log(exception.getStatus()); + } + + if (traversals != null) { + for (int i= 0; i < traversals.length; i++) { + IResource[] traversalResources= traversals[i].getResources(); + if (traversalResources != null) { + for (int j= 0; j < traversalResources.length; j++) { + resources.add(traversalResources[j]); + }// for + }// if + }// for + }// if + }// if + } + } + return (IResource[]) resources.toArray(new IResource[resources.size()]); + } + +} Property changes on: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/AbstractProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java 2010-08-16 20:57:44 UTC (rev 24193) @@ -0,0 +1,15 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; + +public class DeleteProcessHandler extends AbstractHandler { + + @Override + public Object execute(ExecutionEvent arg0) throws ExecutionException { + System.out.println("hello, delete world"); + return null; + } + +} Property changes on: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/DeleteProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java (rev 0) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java 2010-08-16 20:57:44 UTC (rev 24193) @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2003, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.jdt.ui.actions.RefactorActionGroup; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.actions.ActionContext; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; + +/** + * Contributes the following actions to the menu on behalf of the JDT content + * extension. + * + * <ul> + * <li>{@link RefactorActionGroup}. Contributes the "Refactor>" and "Source>" submenus to the context menu.</li> + * </ul> + */ +public class JavaNavigatorRefactorActionProvider extends CommonActionProvider { + + private RefactorActionGroup fRefactorGroup; + + public void fillActionBars(IActionBars actionBars) { + if (fRefactorGroup != null) { + fRefactorGroup.fillActionBars(actionBars); + fRefactorGroup.retargetFileMenuActions(actionBars); + } + } + + public void fillContextMenu(IMenuManager menu) { + if (fRefactorGroup != null) { + fRefactorGroup.fillContextMenu(menu); + } + } + + public void init(ICommonActionExtensionSite site) { + ICommonViewerWorkbenchSite workbenchSite= null; + if (site.getViewSite() instanceof ICommonViewerWorkbenchSite) + workbenchSite= (ICommonViewerWorkbenchSite) site.getViewSite(); + + // we only initialize the refactor group when in a view part + // (required for the constructor) + if (workbenchSite != null) { + if (workbenchSite.getPart() != null && workbenchSite.getPart() instanceof IViewPart) { + IViewPart viewPart= (IViewPart) workbenchSite.getPart(); + + fRefactorGroup= new RefactorActionGroup(viewPart); + } + } + } + + public void setContext(ActionContext context) { + if (fRefactorGroup != null) { + fRefactorGroup.setContext(context); + } + } + + /* + * @see org.eclipse.ui.actions.ActionGroup#dispose() + * @since 3.5 + */ + public void dispose() { + if (fRefactorGroup != null) + fRefactorGroup.dispose(); + super.dispose(); + } +} Property changes on: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/JavaNavigatorRefactorActionProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java 2010-08-16 20:57:44 UTC (rev 24193) @@ -0,0 +1,15 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; + +public class MoveProcessHandler extends AbstractHandler { + + @Override + public Object execute(ExecutionEvent arg0) throws ExecutionException { + System.out.println("hello, move world"); + return null; + } + +} Property changes on: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java 2010-08-16 20:57:44 UTC (rev 24193) @@ -0,0 +1,39 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.handlers.HandlerUtil; + +public class RenameProcessHandler extends AbstractProcessHandler { + + public Object execute(ExecutionEvent event) throws ExecutionException { + Shell activeShell= HandlerUtil.getActiveShell(event); + ISelection sel= HandlerUtil.getCurrentSelection(event); + if (sel instanceof IStructuredSelection) { + IResource resource= getCurrentResource((IStructuredSelection) sel); + if (resource != null) { + RenameProcessWizard refactoringWizard= new RenameProcessWizard(resource); + RefactoringWizardOpenOperation op= new RefactoringWizardOpenOperation(refactoringWizard); + try { + op.run(activeShell, "Rename Process"); + } catch (InterruptedException e) { + // do nothing + } + } + } + return null; + } + + private IResource getCurrentResource(IStructuredSelection sel) { + IResource[] resources= getSelectedResources(sel); + if (resources.length == 1) { + return resources[0]; + } + return null; + } +} Property changes on: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java (rev 0) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java 2010-08-16 20:57:44 UTC (rev 24193) @@ -0,0 +1,239 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceStatus; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory; +import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant; +import org.eclipse.ltk.core.refactoring.participants.RenameProcessor; +import org.eclipse.ltk.core.refactoring.participants.ResourceChangeChecker; +import org.eclipse.ltk.core.refactoring.participants.SharableParticipants; +import org.eclipse.ltk.core.refactoring.resource.RenameResourceChange; + +public class RenameProcessProcessor extends RenameProcessor { + + private IResource jpdlResource; + private IResource gpdResource; + private String newProcessName; + private boolean updateReferences; + + public RenameProcessProcessor(IResource resource) { + if (resource == null || !resource.exists()) { + throw new IllegalArgumentException("resource must not be null and must exist"); //$NON-NLS-1$ + } + + if (isJpdlFile(resource)) { + jpdlResource = resource; + gpdResource = getGpdResource(resource); + } else if (isGpdFile(resource)) { + jpdlResource = getJpdlResource(resource); + gpdResource = resource; + } + + if (jpdlResource != null && jpdlResource.exists() && gpdResource != null && gpdResource.exists()) { + + updateReferences= true; + + String newName = jpdlResource.getName(); + int i = newName.indexOf(".jpdl.xml"); + if (i != -1) { + newName = newName.substring(0, i); + } + setNewProcessName(newName); + + } else { + throw new IllegalArgumentException("both jpdlFile and gpdFile must not be null and must exist"); + } + } + + private String getProcessName(IResource resource) { + String name = resource.getName(); + if (name.startsWith(".") && name.endsWith(".gpd.xml")) { + return name.substring(1, name.indexOf(".gpd.xml")); + } else if (name.endsWith(".jpdl.xml")) { + return name.substring(0, name.indexOf(".jpdl.xml")); + } else { + throw new IllegalArgumentException("resource must be either a jpdlFile or gpdFile"); + } + } + + private boolean isJpdlFile(IResource resource) { + return resource.getName().endsWith(".jpdl.xml"); + } + + private boolean isGpdFile(IResource resource) { + String name = resource.getName(); + return name.startsWith(".") && name.endsWith(".gpd.xml"); + } + + private IResource getGpdResource(IResource resource) { + if (!resource.getName().endsWith(".jpdl.xml")) { + throw new IllegalArgumentException("gpd resource can only be obtained for a jpdl file"); + } + return resource.getParent().getFile(new Path("." + getProcessName(resource) + ".gpd.xml")); + } + + private IResource getJpdlResource(IResource resource) { + if (!resource.getName().endsWith(".gpd.xml")) { + throw new IllegalArgumentException("jpdl resource can only be obtained for a gpd file"); + } + return resource.getParent().getFile(new Path(getProcessName(resource) + ".jpdl.xml")); + } + + public String getNewProcessName() { + return newProcessName; + } + + public void setNewProcessName(String newName) { + Assert.isNotNull(newName); + newProcessName= newName; + } + + public boolean isUpdateReferences() { + return updateReferences; + } + + public void setUpdateReferences(boolean updateReferences) { + this.updateReferences= updateReferences; + } + + public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException { + IStatus result = null; + if (!jpdlResource.isSynchronized(IResource.DEPTH_INFINITE)) { + result = new Status ( + IStatus.ERROR, + ResourcesPlugin.PI_RESOURCES, + IResourceStatus.OUT_OF_SYNC_LOCAL, + "Resource " + jpdlResource.getName() + "is out of sync with file system", + null); + } + if (!gpdResource.isSynchronized(IResource.DEPTH_INFINITE)) { + IStatus temp = new Status ( + IStatus.ERROR, + ResourcesPlugin.PI_RESOURCES, + IResourceStatus.OUT_OF_SYNC_LOCAL, + "Resource " + jpdlResource.getName() + "is out of sync with file system", + null); + if (result == null) { + result = temp; + } else { + MultiStatus multi = new MultiStatus( + ResourcesPlugin.PI_RESOURCES, + IResourceStatus.OUT_OF_SYNC_LOCAL, + "both resources are out of sync with file system", + null); + multi.add(result); + multi.add(temp); + result = multi; + } + } + if (result == null) { + result = Status.OK_STATUS; + } + return RefactoringStatus.create(result); + } + + public RefactoringStatus checkFinalConditions(IProgressMonitor pm, CheckConditionsContext context) throws CoreException { + pm.beginTask("", 1); + try { + ResourceChangeChecker checker= (ResourceChangeChecker) context.getChecker(ResourceChangeChecker.class); + IResourceChangeDescriptionFactory deltaFactory= checker.getDeltaFactory(); + IPath newJpdlPath= jpdlResource.getFullPath().removeLastSegments(1).append(getNewProcessName() + ".jpdl.xml"); + deltaFactory.move( + jpdlResource, newJpdlPath); + IPath newGpdPath= gpdResource.getFullPath().removeLastSegments(1).append("." + getNewProcessName() + ".gpd.xml"); + deltaFactory.move( + gpdResource, newGpdPath); + return new RefactoringStatus(); + } finally { + pm.done(); + } + } + + public RefactoringStatus validateNewElementName(String newName) { + Assert.isNotNull(newName, "new name"); + IContainer c= jpdlResource.getParent(); + if (c == null) + return RefactoringStatus.createFatalErrorStatus("Internal Error"); + if ("".equals(newName)) { + return RefactoringStatus.createFatalErrorStatus("The name of the process cannot be the empty string"); + } + if (c.findMember(newName + ".jpdl.xml") != null || c.findMember("." + newName + ".gpd.xml") != null) + return RefactoringStatus.createFatalErrorStatus("A process with this name already exists"); + + if (!c.getFullPath().isValidSegment(newName + ".jpdl.xml") || !c.getFullPath().isValidSegment("." + newName + ".gpd.xml")) + return RefactoringStatus.createFatalErrorStatus("This is an invalid name for a process"); + + RefactoringStatus result= RefactoringStatus.create(c.getWorkspace().validateName(newName, jpdlResource.getType())); + if (!result.hasFatalError()) { + result.merge(RefactoringStatus.create(c.getWorkspace().validateName(newName, gpdResource.getType()))); + } + if (!result.hasFatalError()) + result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(jpdlResource, newName), jpdlResource.getType()))); + if (!result.hasFatalError()) + result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(gpdResource, newName), gpdResource.getType()))); + return result; + } + + public Change createChange(IProgressMonitor pm) throws CoreException { + pm.beginTask("", 1); + try { + CompositeChange compositeChange = new CompositeChange("process rename"); + compositeChange.add(new RenameResourceChange(jpdlResource.getFullPath(), getNewProcessName() + ".jpdl.xml")); + compositeChange.add(new RenameResourceChange(gpdResource.getFullPath(), "." + getNewProcessName() + ".gpd.xml")); + return compositeChange; + } finally { + pm.done(); + } + } + + private String createNewPath(IResource resource, String newName) { + return resource.getFullPath().removeLastSegments(1).append(newName).toString(); + } + + public Object[] getElements() { + return new Object[] { jpdlResource, gpdResource}; + } + + public String getIdentifier() { + return "org.jbpm.gd.jpdl.refactoring.renameProcessProcessor"; + } + + public String getProcessorName() { + return "Rename Process"; + } + + public boolean isApplicable() { + if (jpdlResource == null) + return false; + if (!jpdlResource.exists()) + return false; + if (!jpdlResource.isAccessible()) + return false; + if (gpdResource == null) + return false; + if (!gpdResource.exists()) + return false; + if (!gpdResource.isAccessible()) + return false; + return true; + } + + public RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants shared) throws CoreException { + return new RefactoringParticipant[0]; + } + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java (rev 0) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java 2010-08-16 20:57:44 UTC (rev 24193) @@ -0,0 +1,98 @@ +package org.jbpm.gd.jpdl.refactoring; + +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; +import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; + +public class RenameProcessWizard extends RefactoringWizard { + + public RenameProcessWizard(IResource resource) { + super(new RenameRefactoring(new RenameProcessProcessor(resource)), DIALOG_BASED_USER_INTERFACE); + setDefaultPageTitle("Rename Process"); + setWindowTitle("Rename Process"); + } + + protected void addUserInputPages() { + RenameProcessProcessor processor= (RenameProcessProcessor) getRefactoring().getAdapter(RenameProcessProcessor.class); + addPage(new RenameProcessRefactoringConfigurationPage(processor)); + } + + private static class RenameProcessRefactoringConfigurationPage extends UserInputWizardPage { + + private final RenameProcessProcessor refactoringProcessor; + private Text nameField; + + public RenameProcessRefactoringConfigurationPage(RenameProcessProcessor processor) { + super("RenameResourceRefactoringInputPage"); + refactoringProcessor= processor; + } + + public void createControl(Composite parent) { + Composite composite= new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout(2, false)); + composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + composite.setFont(parent.getFont()); + + Label label= new Label(composite, SWT.NONE); + label.setText("New na&me"); + label.setLayoutData(new GridData()); + + nameField= new Text(composite, SWT.BORDER); + nameField.setText(refactoringProcessor.getNewProcessName()); + nameField.setFont(composite.getFont()); + nameField.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false)); + nameField.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + validatePage(); + } + }); + + nameField.selectAll(); + setPageComplete(false); + setControl(composite); + } + + public void setVisible(boolean visible) { + if (visible) { + nameField.setFocus(); + } + super.setVisible(visible); + } + + protected final void validatePage() { + String text= nameField.getText(); + RefactoringStatus status= refactoringProcessor.validateNewElementName(text); + setPageComplete(status); + } + + protected boolean performFinish() { + initializeRefactoring(); + storeSettings(); + return super.performFinish(); + } + + public IWizardPage getNextPage() { + initializeRefactoring(); + storeSettings(); + return super.getNextPage(); + } + + private void storeSettings() { + } + + private void initializeRefactoring() { + refactoringProcessor.setNewProcessName(nameField.getText()); + } + } +} Property changes on: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24192 - trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2010-08-16 16:55:22 -0400 (Mon, 16 Aug 2010) New Revision: 24192 Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java Log: https://jira.jboss.org/browse/JBIDE-6785 Prevent concurrent list modification exception Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java 2010-08-16 20:54:28 UTC (rev 24191) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java 2010-08-16 20:55:22 UTC (rev 24192) @@ -129,25 +129,39 @@ } protected void fireModelDeleted(ResourceInfo sr) { - for (IEditModelListener next : updateListeners ) { + // https://jira.jboss.org/browse/JBIDE-6785 + // Prevent concurrent list modification exception: + // When a resource is deleted, the BPEL editor shuts itself down for no + // apparently good reason (I'm sure it's to avoid some other kinds of disasters + // that it isn't equipped to deal with!) This causes the editor to remove itself + // from our update listeners list. + ArrayList<IEditModelListener> listeners = new ArrayList<IEditModelListener>(updateListeners.size()); + listeners.addAll(updateListeners); + for (IEditModelListener next : listeners ) { next.modelDeleted(sr); } } protected void fireModelReloaded(ResourceInfo sr) { - for (IEditModelListener next : updateListeners ) { + ArrayList<IEditModelListener> listeners = new ArrayList<IEditModelListener>(updateListeners.size()); + listeners.addAll(updateListeners); + for (IEditModelListener next : listeners ) { next.modelReloaded(sr); } } protected void fireModelLocationChanged(ResourceInfo sr, IFile movedToFile) { - for (IEditModelListener next : updateListeners ) { + ArrayList<IEditModelListener> listeners = new ArrayList<IEditModelListener>(updateListeners.size()); + listeners.addAll(updateListeners); + for (IEditModelListener next : listeners ) { next.modelLocationChanged(sr,movedToFile); } } protected void fireModelMarkersChanged (ResourceInfo sr, IMarkerDelta[] markerDelta ) { - for (IEditModelListener next : updateListeners ) { + ArrayList<IEditModelListener> listeners = new ArrayList<IEditModelListener>(updateListeners.size()); + listeners.addAll(updateListeners); + for (IEditModelListener next : listeners ) { next.modelMarkersChanged(sr,markerDelta ); } }

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24191 - branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-08-16 16:54:28 -0400 (Mon, 16 Aug 2010) New Revision: 24191 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java Log: JBIDE-6846 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java 2010-08-16 20:53:43 UTC (rev 24190) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java 2010-08-16 20:54:28 UTC (rev 24191) @@ -22,9 +22,10 @@ String editorArea = layout.getEditorArea(); IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT, (float)0.20, editorArea); //$NON-NLS-1$ - folder.addView(JavaUI.ID_PACKAGES); + folder.addView("org.eclipse.ui.navigator.ProjectExplorer"); + folder.addPlaceholder(JavaUI.ID_PACKAGES); folder.addPlaceholder(JavaUI.ID_TYPE_HIERARCHY); - folder.addPlaceholder(IPageLayout.ID_RES_NAV); + folder.addPlaceholder("org.eclipse.ui.views.ResourceNavigator"); IFolderLayout outputfolder= layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.70, editorArea); //$NON-NLS-1$ outputfolder.addView(IPageLayout.ID_PROP_SHEET);

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24190 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-08-16 16:53:43 -0400 (Mon, 16 Aug 2010) New Revision: 24190 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java Log: JBIDE-6846 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java 2010-08-16 20:31:43 UTC (rev 24189) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/JpdlPerspectiveFactory.java 2010-08-16 20:53:43 UTC (rev 24190) @@ -22,9 +22,10 @@ String editorArea = layout.getEditorArea(); IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT, (float)0.20, editorArea); //$NON-NLS-1$ - folder.addView(JavaUI.ID_PACKAGES); + folder.addView("org.eclipse.ui.navigator.ProjectExplorer"); + folder.addPlaceholder(JavaUI.ID_PACKAGES); folder.addPlaceholder(JavaUI.ID_TYPE_HIERARCHY); - folder.addPlaceholder(IPageLayout.ID_RES_NAV); + folder.addPlaceholder("org.eclipse.ui.views.ResourceNavigator"); IFolderLayout outputfolder= layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.70, editorArea); //$NON-NLS-1$ outputfolder.addView(IPageLayout.ID_PROP_SHEET);

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24189 - branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-08-16 16:31:43 -0400 (Mon, 16 Aug 2010) New Revision: 24189 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java Log: JBIDE-6844 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java =================================================================== --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-08-16 20:28:18 UTC (rev 24188) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-08-16 20:31:43 UTC (rev 24189) @@ -221,6 +221,10 @@ setMessage("Enter a name for the process."); setPageComplete(false); return false; + } else if (processExists()) { + setMessage("A process with this name already exists in this container."); + setPageComplete(false); + return false; } else { setMessage(null); setPageComplete(true); @@ -228,6 +232,13 @@ } } + private boolean processExists() { + IFolder folder = getProcessFolder(); + IFile processDefinitionFile = folder.getFile(getProcessName() + ".jpdl.xml"); + IFile gpdFile = folder.getFile("." + getProcessName() + ".gpd.xml"); + return processDefinitionFile.exists() || gpdFile.exists(); + } + public IFolder getProcessFolder() { return workspaceRoot.getFolder(new Path(containerText.getText())); }

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24188 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2010-08-16 16:28:18 -0400 (Mon, 16 Aug 2010) New Revision: 24188 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java Log: JBIDE-6844 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-08-16 20:02:45 UTC (rev 24187) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-08-16 20:28:18 UTC (rev 24188) @@ -221,6 +221,10 @@ setMessage("Enter a name for the process."); setPageComplete(false); return false; + } else if (processExists()) { + setMessage("A process with this name already exists in this container."); + setPageComplete(false); + return false; } else { setMessage(null); setPageComplete(true); @@ -228,6 +232,13 @@ } } + private boolean processExists() { + IFolder folder = getProcessFolder(); + IFile processDefinitionFile = folder.getFile(getProcessName() + ".jpdl.xml"); + IFile gpdFile = folder.getFile("." + getProcessName() + ".gpd.xml"); + return processDefinitionFile.exists() || gpdFile.exists(); + } + public IFolder getProcessFolder() { return workspaceRoot.getFolder(new Path(containerText.getText())); }

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24187 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-16 16:02:45 -0400 (Mon, 16 Aug 2010) New Revision: 24187 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java Log: 2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (changeEvent): Check if there any clouds and that there is a current cloud before referencing anything. If it turns out there are no longer any clouds, set the input to an empty list of instances. (.modifyText): Refresh the view in an async display thread. (createPartControl): Check if there are any clouds before setting currCloud or accessing the clouds collection. (initializeCloudSelector): Ditto. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (performFinish): Create DeltaCloud with special persistence option set to true. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-16 19:59:46 UTC (rev 24186) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-16 20:02:45 UTC (rev 24187) @@ -1,3 +1,16 @@ +2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com> + + * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (changeEvent): Check if + there any clouds and that there is a current cloud before referencing anything. If + it turns out there are no longer any clouds, set the input to an empty list of + instances. + (.modifyText): Refresh the view in an async display thread. + (createPartControl): Check if there are any clouds before setting currCloud or accessing + the clouds collection. + (initializeCloudSelector): Ditto. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (performFinish): + Create DeltaCloud with special persistence option set to true. + 2010-08-13 Jeff Johnston <jjohnstn(a)redhat.com> * icons/delta-large.gif: New file. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-16 19:59:46 UTC (rev 24186) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-16 20:02:45 UTC (rev 24187) @@ -98,10 +98,19 @@ public void modifyText(ModifyEvent e) { int index = cloudSelector.getSelectionIndex(); currCloud = clouds[index]; - currCloud.removeInstanceListListener(parentView); - viewer.setInput(currCloud); - currCloud.addInstanceListListener(parentView); - viewer.refresh(); + Display.getCurrent().asyncExec(new Runnable() { + + @Override + public void run() { + // TODO Auto-generated method stub + currCloud.removeInstanceListListener(parentView); + viewer.setInput(currCloud); + currCloud.addInstanceListListener(parentView); + viewer.refresh(); + + } + + }); } }; @@ -180,10 +189,12 @@ } table.setSortDirection(SWT.NONE); - currCloud = clouds[0]; - currCloud.removeInstanceListListener(parentView); - viewer.setInput(clouds[0]); - currCloud.addInstanceListListener(parentView); + if (clouds.length > 0) { + currCloud = clouds[0]; + currCloud.removeInstanceListListener(parentView); + viewer.setInput(clouds[0]); + currCloud.addInstanceListListener(parentView); + } FormData f = new FormData(); f.top = new FormAttachment(0, 8); @@ -438,24 +449,36 @@ cloudNames[i] = clouds[i].getName(); } cloudSelector.setItems(cloudNames); - cloudSelector.setText(cloudNames[0]); - currCloud = clouds[0]; + if (clouds.length > 0) { + cloudSelector.setText(cloudNames[0]); + currCloud = clouds[0]; + } } public void changeEvent(int type) { - String currName = currCloud.getName(); + String currName = null; clouds = DeltaCloudManager.getDefault().getClouds(); + if (currCloud != null) { + currName = currCloud.getName(); + } String[] cloudNames = new String[clouds.length]; int index = 0; for (int i = 0; i < clouds.length; ++i) { cloudNames[i] = clouds[i].getName(); - if (currName.equals(cloudNames[i])) + if (cloudNames[i].equals(currName)) index = i; } cloudSelector.removeModifyListener(cloudModifyListener); cloudSelector.setItems(cloudNames); - cloudSelector.setText(cloudNames[index]); - currCloud = clouds[index]; + if (cloudNames.length > 0) { + cloudSelector.setText(cloudNames[index]); + currCloud = clouds[index]; + viewer.setInput(currCloud); + } else { + currCloud = null; + cloudSelector.setText(""); + viewer.setInput(new DeltaCloudInstance[0]); + } cloudSelector.addModifyListener(cloudModifyListener); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java 2010-08-16 19:59:46 UTC (rev 24186) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java 2010-08-16 20:02:45 UTC (rev 24187) @@ -59,7 +59,7 @@ String username = mainPage.getUsername(); String password = mainPage.getPassword(); try { - DeltaCloud newCloud = new DeltaCloud(name, url, username, password); + DeltaCloud newCloud = new DeltaCloud(name, url, username, password, true); DeltaCloudManager.getDefault().addCloud(newCloud); } catch (MalformedURLException e) { Activator.log(e);

15 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2010