JBoss Tools SVN: r11516 - trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-05 04:49:54 -0500 (Wed, 05 Nov 2008)
New Revision: 11516
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
Log:
JBIDE-2988
Check the "selector" string , if there is any "/" "\" ":" , the analyzer will throw a exception
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-05 09:49:17 UTC (rev 11515)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-05 09:49:54 UTC (rev 11516)
@@ -51,6 +51,22 @@
return binding;
}
+ public static List<Object> getBindingListFromResourceConfigType(
+ ResourceConfigType resourceConfig) {
+ List<ParamType> paramList = resourceConfig.getParam();
+ for (Iterator<ParamType> iterator = paramList.iterator(); iterator.hasNext();) {
+ ParamType param = iterator.next();
+ if ("bindings".equals(param.getName())) {
+ if (param.eContents().isEmpty())
+ continue;
+ List<Object> bindingList = (List<Object>) param.getMixed().get(
+ SmooksModelUtils.ELEMENT_BINDING, false);
+ return bindingList;
+ }
+ }
+ return null;
+ }
+
public static String getTransformType(ResourceConfigType resourceConfig){
ParamType typeParam = null;
if(isTransformTypeResourceConfig(resourceConfig)){
17 years, 2 months
JBoss Tools SVN: r11515 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: xml2java/analyzer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-05 04:49:17 -0500 (Wed, 05 Nov 2008)
New Revision: 11515
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
Log:
JBIDE-2988
Check the "selector" string , if there is any "/" "\" ":" , the analyzer will throw a exception
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-05 08:31:21 UTC (rev 11514)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-05 09:49:17 UTC (rev 11515)
@@ -54,6 +54,7 @@
import org.jboss.tools.smooks.model.SmooksResourceListType;
import org.jboss.tools.smooks.model.provider.SmooksItemProviderAdapterFactory;
import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+import org.jboss.tools.smooks.ui.SmooksUIActivator;
import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel;
import org.jboss.tools.smooks.ui.gef.model.GraphRootModel;
import org.jboss.tools.smooks.ui.gef.model.IConnectableModel;
@@ -193,15 +194,6 @@
ResourceConfigType resourceConfig = SmooksFactory.eINSTANCE
.createResourceConfigType();
resourceList.add(resourceConfig);
- // Command addResourceConfigCommand = AddCommand
- // .create(
- // editingDomain,
- // resourceList,
- // SmooksPackage.eINSTANCE
- // .getSmooksResourceListType_AbstractResourceConfig(),
- // resourceConfig);
- // addResourceConfigCommand.execute();
- // resouceConfig.
resourceConfig
.setSelector(getSourceBeanSelectorString((AbstractStructuredDataModel) source));
setConnectionUsed(connection);
@@ -273,8 +265,9 @@
.addBindingTypeToParamType(
bindingsParam, jbean.getName(),
currentSelectorName, null, null);
- UIUtils.assignConnectionPropertyToBinding(childConnection, binding,
- new String[] { "property", "selector" });
+ UIUtils.assignConnectionPropertyToBinding(
+ childConnection, binding, new String[] {
+ "property", "selector" });
if (!jbean.isPrimitive()) {
analyzeStructuredDataModel(
resourceList,
@@ -530,7 +523,7 @@
SmooksResourceListType resourceList,
ResourceConfigType resourceConfig, JavaBeanModel source,
JavaBeanModel target) {
- List bindingList = this
+ List bindingList = SmooksModelUtils
.getBindingListFromResourceConfigType(resourceConfig);
if (bindingList == null)
return;
@@ -565,9 +558,9 @@
}
if (sourceModel != null) {
MappingModel model = new MappingModel(sourceModel, targetModel);
- UIUtils.assignBindingPropertyToMappingModel(binding, model, new Object[] {
- SmooksModelUtils.ATTRIBUTE_PROPERTY,
- SmooksModelUtils.ATTRIBUTE_SELECTOR });
+ UIUtils.assignBindingPropertyToMappingModel(binding, model,
+ new Object[] { SmooksModelUtils.ATTRIBUTE_PROPERTY,
+ SmooksModelUtils.ATTRIBUTE_SELECTOR });
mappingModelList.add(model);
}
}
@@ -783,7 +776,8 @@
ResourceConfigType currentResourceConfigType,
ClassLoader classLoader) {
if (currentResourceConfigType != null) {
- List bindingList = getBindingListFromResourceConfigType(currentResourceConfigType);
+ List bindingList = SmooksModelUtils
+ .getBindingListFromResourceConfigType(currentResourceConfigType);
if (bindingList == null)
return;
for (Iterator iterator = bindingList.iterator(); iterator.hasNext();) {
@@ -826,28 +820,28 @@
}
}
- protected List getBindingListFromResourceConfigType(
- ResourceConfigType resourceConfig) {
- List paramList = resourceConfig.getParam();
- for (Iterator iterator = paramList.iterator(); iterator.hasNext();) {
- ParamType param = (ParamType) iterator.next();
- if ("bindings".equals(param.getName())) {
- if (param.eContents().isEmpty())
- continue;
- List bindingList = (List) param.getMixed().get(
- SmooksModelUtils.ELEMENT_BINDING, false);
- return bindingList;
- }
- }
- return null;
- }
+ // protected List getBindingListFromResourceConfigType(
+ // ResourceConfigType resourceConfig) {
+ // List paramList = resourceConfig.getParam();
+ // for (Iterator iterator = paramList.iterator(); iterator.hasNext();) {
+ // ParamType param = (ParamType) iterator.next();
+ // if ("bindings".equals(param.getName())) {
+ // if (param.eContents().isEmpty())
+ // continue;
+ // List bindingList = (List) param.getMixed().get(
+ // SmooksModelUtils.ELEMENT_BINDING, false);
+ // return bindingList;
+ // }
+ // }
+ // return null;
+ // }
protected void buildSourceInputProperties(SmooksResourceListType listType,
JavaBeanModel beanModel, boolean rootIsWarning,
boolean rootIsError, ResourceConfigType currentResourceConfigType,
ClassLoader classLoader) {
if (currentResourceConfigType != null) {
- List bindingList = this
+ List bindingList = SmooksModelUtils
.getBindingListFromResourceConfigType(currentResourceConfigType);
if (bindingList == null)
return;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-11-05 08:31:21 UTC (rev 11514)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-11-05 09:49:17 UTC (rev 11515)
@@ -10,15 +10,68 @@
******************************************************************************/
package org.jboss.tools.smooks.xml2java.analyzer;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
+import java.util.List;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.xml.type.AnyType;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.model.AbstractResourceConfig;
+import org.jboss.tools.smooks.model.ResourceConfigType;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+
/**
* @author Dart Peng<br>
* Date : Sep 23, 2008
*/
-public class XMLSourceModelAnalyzer extends AbstractXMLModelAnalyzer{
+public class XMLSourceModelAnalyzer extends AbstractXMLModelAnalyzer {
+ public static final String[] SELECTORE_SPLITER = new String[] { ":", "\\", "/" };
+
public XMLSourceModelAnalyzer() {
super("sourceDataPath");
}
-
+
+ @Override
+ public Object buildSourceInputObjects(GraphInformations graphInfo,
+ SmooksResourceListType listType, IFile sourceFile)
+ throws InvocationTargetException {
+ List<AbstractResourceConfig> lists = listType
+ .getAbstractResourceConfig();
+ for (Iterator<AbstractResourceConfig> iterator = lists.iterator(); iterator
+ .hasNext();) {
+ ResourceConfigType resourceConfig = (ResourceConfigType) iterator
+ .next();
+ String selector = resourceConfig.getSelector();
+ checkBindingSelector(selector);
+ List<Object> list = SmooksModelUtils
+ .getBindingListFromResourceConfigType(resourceConfig);
+ if(list == null) continue;
+ for (Iterator<Object> iterator2 = list.iterator(); iterator2
+ .hasNext();) {
+ AnyType binding = (AnyType) iterator2.next();
+ String bindingMessage = SmooksModelUtils
+ .getAttributeValueFromAnyType(binding,
+ SmooksModelUtils.ATTRIBUTE_SELECTOR);
+ checkBindingSelector(bindingMessage);
+ }
+ }
+ return super.buildSourceInputObjects(graphInfo, listType, sourceFile);
+ }
+
+ protected void checkBindingSelector(String message)
+ throws InvocationTargetException {
+ if(message == null) return;
+ for (int i = 0; i < SELECTORE_SPLITER.length; i++) {
+ String splitString = SELECTORE_SPLITER[i];
+ if (message.indexOf(splitString) != -1) {
+ throw new InvocationTargetException(new Exception(
+ "[XML] The Selector string dosen't support \""
+ + splitString + "\" character"));
+ }
+ }
+ }
+
}
17 years, 2 months
JBoss Tools SVN: r11514 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-05 03:31:21 -0500 (Wed, 05 Nov 2008)
New Revision: 11514
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksListenerRegister.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
JBIDE-2993
Add a resource change listener to detect the smooks resource modifications (Rename , Delete , Move) for processing the .graph file.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-11-05 07:40:14 UTC (rev 11513)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-11-05 08:31:21 UTC (rev 11514)
@@ -190,4 +190,11 @@
targetId="org.jboss.tools.smooks.ui.viewerInitor.javabean">
</commandProcessor>
</extension>
+
+ <extension
+ point="org.eclipse.ui.startup">
+ <startup
+ class="org.jboss.tools.smooks.ui.SmooksListenerRegister">
+ </startup>
+ </extension>
</plugin>
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksListenerRegister.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksListenerRegister.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksListenerRegister.java 2008-11-05 08:31:21 UTC (rev 11514)
@@ -0,0 +1,22 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.ui.IStartup;
+
+/**
+ * @author Dart
+ *
+ */
+public class SmooksListenerRegister implements IStartup {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IStartup#earlyStartup()
+ */
+ public void earlyStartup() {
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(new SmooksResourceChangeListener());
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksListenerRegister.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java 2008-11-05 08:31:21 UTC (rev 11514)
@@ -0,0 +1,170 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
+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.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author Dart
+ *
+ */
+public class SmooksResourceChangeListener implements IResourceChangeListener {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org
+ * .eclipse.core.resources.IResourceChangeEvent)
+ */
+ public void resourceChanged(IResourceChangeEvent event) {
+ try {
+ switch (event.getType()) {
+ case IResourceChangeEvent.POST_CHANGE:
+ event.getDelta().accept(new DeltaPrinter());
+ break;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ private void deleteFile(IPath path) {
+ final IPath path1 = path;
+ WorkspaceJob job = new WorkspaceJob("Delete file") {
+
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
+ path1);
+ if (file.exists()) {
+ file.delete(true, monitor);
+ }
+ return Status.OK_STATUS;
+ }
+ };
+ job.schedule();
+ }
+
+ private void newFile(IPath path, IPath newPath) {
+ final IPath path1 = path;
+ final IPath newPath1 = newPath;
+ WorkspaceJob job = new WorkspaceJob("New file and delete old file") {
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
+ path1);
+ if (file.exists()) {
+ IFile newFile = ResourcesPlugin.getWorkspace().getRoot()
+ .getFile(newPath1);
+ if (newFile.exists()) {
+ if (MessageDialog.openQuestion(new Shell(Display
+ .getDefault()), "Cover", "File "
+ + newFile.getFullPath()
+ + " was exsiting , Cover the file?")) {
+ newFile.setContents(file.getContents(), true, true,
+ monitor);
+ }
+ } else {
+ newFile.create(file.getContents(), true, monitor);
+ }
+ file.delete(true, monitor);
+ }
+ return Status.OK_STATUS;
+ }
+
+ };
+ job.schedule();
+ }
+
+ class DeltaPrinter implements IResourceDeltaVisitor {
+
+ int count = 0;
+
+ public boolean visit(IResourceDelta delta) {
+ IResource res = delta.getResource();
+ String fileExtension = res.getFileExtension();
+ if (!"smooks".equals(fileExtension)) {
+ return true;
+ }
+ int flags = delta.getFlags();
+ switch (delta.getKind()) {
+ case IResourceDelta.ADDED:
+ if (flags == IResourceDelta.MOVED_FROM) {
+ IPath path = delta.getMovedFromPath();
+ String fileName = "";
+ if (path != null) {
+ fileName = path.lastSegment();
+ int dotIndex = fileName.lastIndexOf(".");
+ if (dotIndex != -1) {
+ fileExtension = fileName.substring(dotIndex + 1,
+ fileName.length());
+ }
+ if (!"smooks".equals(fileExtension)) {
+ return true;
+ }
+ fileName += ".graph";
+ path = path.removeLastSegments(1);
+ path = path.append(fileName);
+ }
+
+ IPath newPath = res.getFullPath();
+ fileName = newPath.lastSegment();
+ fileName += ".graph";
+ newPath = newPath.removeLastSegments(1).append(fileName);
+ newFile(path, newPath);
+ }
+ break;
+ case IResourceDelta.REMOVED:
+ if (flags == IResourceDelta.MOVED_TO) {
+ break;
+ }
+ IProject project = res.getProject();
+ try {
+ IProjectNature nature = project
+ .getNature(JavaCore.NATURE_ID);
+ if (nature != null) {
+ IJavaProject javaProject = JavaCore.create(project);
+ IPath outPut = javaProject.getOutputLocation();
+ IPath removeRes = res.getFullPath();
+ if (outPut.isPrefixOf(removeRes)) {
+ break;
+ }
+ }
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ IPath path = res.getFullPath();
+ String fileName = path.lastSegment();
+ fileName += ".graph";
+ path = path.removeLastSegments(1).append(fileName);
+ deleteFile(path);
+ break;
+ }
+ return true; // visit the children
+ }
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-05 07:40:14 UTC (rev 11513)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-05 08:31:21 UTC (rev 11514)
@@ -273,11 +273,6 @@
MappingResourceConfigList configList, SmooksResourceListType list,
ResourceConfigType config, AbstractXMLObject sourceRoot,
JavaBeanModel targetJavaBean) {
- String selector = config.getSelector();
- String beanID = SmooksModelUtils.getParmaText(
- SmooksModelConstants.BEAN_ID, config);
- String beanClass = SmooksModelUtils.getParmaText(
- SmooksModelConstants.BEAN_CLASS, config);
MappingModel mapping = new MappingModel(sourceRoot, targetJavaBean);
configList.getMappingModelList().add(mapping);
17 years, 2 months
JBoss Tools SVN: r11513 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert: src/org/jboss/tools/jbpm/convert/b2j/messages and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-05 02:40:14 -0500 (Wed, 05 Nov 2008)
New Revision: 11513
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
Log:
JBIDE-3089:Clean up text in BPMN to jPDL export wizard
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties 2008-11-04 22:51:46 UTC (rev 11512)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties 2008-11-05 07:40:14 UTC (rev 11513)
@@ -1,5 +1,5 @@
-wizard.name=BPMN -> JPDL
-wizard.description = Export a BPMN file to JPDL
-category.name=BPMN Export
+wizard.name=BPMN to jPDL
+wizard.description = Export a BPMN file to jPDL
+category.name=BPMN
PLUGIN_NAME=BPMNExport
-PLUGIN_PROVIDER=Red Hat, Inc.
\ No newline at end of file
+PLUGIN_PROVIDER=JBoss.org
\ No newline at end of file
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties 2008-11-04 22:51:46 UTC (rev 11512)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties 2008-11-05 07:40:14 UTC (rev 11513)
@@ -31,7 +31,7 @@
Bpmn_File_Choose_WizardPage_ViewerTitle=BPMN resources
Bpmn_File_Choose_WizardPage_Message=Select BPMN resources to convert
Bpmn_Pool_Choose_WizardPage_Name=PoolPage
-Bpmn_Pool_Choose_WizardPage_Message=Available BPMN Pools
+Bpmn_Pool_Choose_WizardPage_Message=BPMN Pools
Bpmn_Pool_Choose_WizardPage_Title=Select BPMN pools to translate
Bpmn_GeneratedFile_Location_WizardPage_Name=LocationPage
Bpmn_GeneratedFile_Location_WizardPage_Message=Select the target location
@@ -40,7 +40,7 @@
Bpmn_GeneratedFile_Location_WizardPage_CheckBox=Overwrite existing resources
Bpmn_Translate_Message_WizardPage_Name=MessagePage
Bpmn_Translate_Message_WizardPage_Title=Conversion Warnings and Errors
-Bpmn_Translate_Message_WizardPage_Message=Warnings and Errors that occured during conversion
+Bpmn_Translate_Message_WizardPage_Message=Warnings and Errors that occurred during conversion
Bpmn_Translate_Message_WizardpageViewer_Title=Warnings and Errors
Bpmn_EAnnotations_Element_Name=eAnnotations
Bpmn_Details_Element_Name=details
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-04 22:51:46 UTC (rev 11512)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-05 07:40:14 UTC (rev 11513)
@@ -52,7 +52,8 @@
public BpmnPoolsChoicePage(String pageName, String title, String listTitle) {
super(pageName);
this.listTitle = listTitle;
- this.setTitle(title);
+ this.setDescription(title);
+ this.setTitle(listTitle);
}
public void createControl(Composite parent) {
17 years, 2 months
JBoss Tools SVN: r11512 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-04 17:51:46 -0500 (Tue, 04 Nov 2008)
New Revision: 11512
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-3096 - adding module actions re: full / incremental publishing
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2008-11-04 22:51:46 UTC (rev 11512)
@@ -0,0 +1,147 @@
+package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.ICommonViewerSite;
+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.PublishServerJob;
+import org.eclipse.wst.server.core.internal.Server;
+import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
+import org.jboss.ide.eclipse.as.core.util.ModuleUtil;
+import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.ide.eclipse.as.ui.Messages;
+
+public class ModuleActionProvider extends CommonActionProvider {
+ private Action deleteModuleAction, fullPublishModuleAction, incrementalPublishModuleAction;
+ private ModuleServer[] selection;
+
+ private ICommonActionExtensionSite actionSite;
+ public ModuleActionProvider() {
+ super();
+ }
+
+ public void init(ICommonActionExtensionSite aSite) {
+ super.init(aSite);
+ this.actionSite = aSite;
+ createActions();
+ }
+ public void fillContextMenu(IMenuManager menu) {
+ ICommonViewerSite site = actionSite.getViewSite();
+ IStructuredSelection selection = null;
+ if (site instanceof ICommonViewerWorkbenchSite) {
+ ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site;
+ selection = (IStructuredSelection) wsSite.getSelectionProvider()
+ .getSelection();
+ }
+
+ if( allAre(selection, ModuleServer.class)) {
+ Object[] arr = selection.toArray();
+ ModuleServer[] ms = new ModuleServer[arr.length];
+ for( int i = 0; i < arr.length; i++ )
+ ms[i] = (ModuleServer)arr[i];
+ this.selection = ms;
+ menu.add(deleteModuleAction);
+ menu.add(fullPublishModuleAction);
+ menu.add(incrementalPublishModuleAction);
+ }
+ }
+
+ protected boolean allAre(IStructuredSelection sel, Class c) {
+ if( sel == null )
+ return false;
+ Iterator i = sel.iterator();
+ while(i.hasNext())
+ if(!i.next().getClass().equals(c))
+ return false;
+ return true;
+ }
+
+
+ protected void createActions() {
+ deleteModuleAction = new Action() {
+ public void run() {
+ deleteModule();
+ }
+ };
+ deleteModuleAction.setText(Messages.DeleteModuleText);
+ deleteModuleAction.setDescription(Messages.DeleteModuleDescription);
+ deleteModuleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.UNPUBLISH_IMAGE));
+
+ fullPublishModuleAction = new Action() {
+ public void run() {
+ actionPublish(IServer.PUBLISH_STATE_FULL);
+ }
+ };
+ fullPublishModuleAction.setText(Messages.FullPublishModuleText);
+ fullPublishModuleAction.setDescription(Messages.PublishModuleDescription);
+ fullPublishModuleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.PUBLISH_IMAGE));
+
+
+ incrementalPublishModuleAction = new Action() {
+ public void run() {
+ actionPublish(IServer.PUBLISH_STATE_INCREMENTAL);
+ }
+ };
+ incrementalPublishModuleAction.setText(Messages.IncrementalPublishModuleText);
+ incrementalPublishModuleAction.setDescription(Messages.PublishModuleDescription);
+ incrementalPublishModuleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.PUBLISH_IMAGE));
+
+ }
+
+ protected void actionPublish(int type) {
+ // Assumption: Anything selected is already on the server, or it wouldnt be in the view.
+ if( selection != null && selection.length > 0 ) {
+ Server s = ((Server)selection[0].server);
+ for( int i = 0; i < selection.length; i++ ) {
+ IModule[] mod = selection[i].module;
+ s.setModulePublishState(mod, type);
+ ArrayList<IModule[]> allChildren = ModuleUtil.getDeepChildren(s, mod);
+ for( int j = 0; j < allChildren.size(); j++ ) {
+ s.setModulePublishState((IModule[])allChildren.get(j), type);
+ }
+ }
+ new PublishServerJob(s, IServer.PUBLISH_INCREMENTAL, true).schedule();
+ }
+ }
+
+ protected void deleteModule() {
+ if (MessageDialog.openConfirm(new Shell(), Messages.ServerDialogHeading, Messages.DeleteModuleConfirm)) {
+ Thread t = new Thread() { public void run() {
+ try {
+ if( selection.length > 0 && selection[0].server != null ) {
+ IServer server = selection[0].server;
+ ArrayList topModsToRemove = new ArrayList();
+ IModule topModTmp;
+ for( int i = 0; i < selection.length; i++ ) {
+ if( !topModsToRemove.contains(selection[i].module[0]))
+ topModsToRemove.add(selection[i].module[0]);
+ }
+ IServerWorkingCopy serverWC = server.createWorkingCopy();
+ IModule[] modsToRemove =
+ (IModule[]) topModsToRemove.toArray(new IModule[topModsToRemove.size()]);
+ ServerUtil.modifyModules(serverWC, new IModule[0], modsToRemove, new NullProgressMonitor());
+ IServer server2 = serverWC.save(true, null);
+ new PublishServerJob(server2, IServer.PUBLISH_INCREMENTAL, true).schedule();
+ }
+ } catch (CoreException e) {
+ // ignore
+ }
+ }};
+ t.start();
+ }
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-04 21:28:20 UTC (rev 11511)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-04 22:51:46 UTC (rev 11512)
@@ -483,7 +483,19 @@
priority="highest">
</actionProvider>
</navigatorContent>
+ <actionProvider
+ class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ModuleActionProvider"
+ id="org.jboss.ide.eclipse.as.ui.extensions.modules">
+ <enablement>
+ <instanceof
+ value="org.eclipse.wst.server.ui.internal.view.servers.ModuleServer">
+ </instanceof>
+ </enablement>
+ </actionProvider>
</extension>
+
+
+
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
@@ -499,6 +511,14 @@
</contentExtension>
</includes>
</viewerContentBinding>
+ <viewerActionBinding
+ viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView">
+ <includes>
+ <actionExtension
+ pattern="org.jboss.ide.eclipse.as.ui.extensions.modules">
+ </actionExtension>
+ </includes>
+ </viewerActionBinding>
</extension>
17 years, 2 months
JBoss Tools SVN: r11508 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss: tools/as/wst/server/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-04 16:18:58 -0500 (Tue, 04 Nov 2008)
New Revision: 11508
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/action/
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/views/server/preferencepages/
Log:
deleting empty folders
17 years, 2 months
JBoss Tools SVN: r11507 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-04 15:58:20 -0500 (Tue, 04 Nov 2008)
New Revision: 11507
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-3099 - view id regression
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2008-11-04 19:25:54 UTC (rev 11506)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2008-11-04 20:58:20 UTC (rev 11507)
@@ -134,7 +134,7 @@
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
- viewerId="org.jboss.tools.as.wst.server.ui.ServersView">
+ viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView">
<includes>
<contentExtension
isRoot="false"
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java 2008-11-04 19:25:54 UTC (rev 11506)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java 2008-11-04 20:58:20 UTC (rev 11507)
@@ -60,7 +60,7 @@
layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.RIGHT, (float)0.75, editorArea);
IFolderLayout serverFolder = layout.createFolder("leftBottom", IPageLayout.BOTTOM, (float)0.60, "left"); //$NON-NLS-1$ //$NON-NLS-2$
- serverFolder.addView("org.jboss.tools.as.wst.server.ui.ServersView"); //$NON-NLS-1$
+ serverFolder.addView("org.jboss.ide.eclipse.as.ui.views.JBossServerView"); //$NON-NLS-1$
layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-04 19:25:54 UTC (rev 11506)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-04 20:58:20 UTC (rev 11507)
@@ -165,7 +165,7 @@
point="org.eclipse.ui.perspectiveExtensions">
<perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
<view
- id="org.jboss.tools.as.wst.server.ui.ServersView"
+ id="org.jboss.ide.eclipse.as.ui.views.JBossServerView"
ratio="0.5"
relationship="right"
relative="org.eclipse.ui.views.TaskList"/>
@@ -321,7 +321,7 @@
<extension point="org.eclipse.ui.views">
<view
- id="org.jboss.tools.as.wst.server.ui.ServersView"
+ id="org.jboss.ide.eclipse.as.ui.views.JBossServerView"
name="JBoss Server View"
category="org.eclipse.wst.server.ui"
class="org.jboss.tools.as.wst.server.ui.ServersView"
@@ -399,7 +399,7 @@
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
- viewerId="org.jboss.tools.as.wst.server.ui.ServersView">
+ viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView">
<includes>
<contentExtension
isRoot="true"
@@ -487,7 +487,7 @@
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
- viewerId="org.jboss.tools.as.wst.server.ui.ServersView">
+ viewerId="org.jboss.ide.eclipse.as.ui.views.JBossServerView">
<includes>
<contentExtension
isRoot="false"
17 years, 2 months