Author: DartPeng
Date: 2009-05-11 05:39:14 -0400 (Mon, 11 May 2009)
New Revision: 15149
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/AddSmooksResourceAction.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java
Log:
JBIDE-4298
1.change some labels
2.reorder the popmenu actions position
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-11 09:09:42
UTC (rev 15148)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-11 09:39:14
UTC (rev 15149)
@@ -90,7 +90,7 @@
_UI_ParamType_type = Param
_UI_ProfilesType_type = Profiles
_UI_ProfileType_type = Profile
-_UI_ReaderType_type = Reader
+_UI_ReaderType_type = Custome Reader
_UI_ResourceConfigType_type = Resource Config
_UI_ResourceType_type = Resource
_UI_SetOffType_type = Set Off
@@ -218,8 +218,8 @@
_UI_WiringType_setterMethod_feature = Setter Method
_UI_WiringType_wireOnElement_feature = Wire On Element
_UI_WiringType_wireOnElementNS_feature = Wire On Element NS
-_UI_Xsl_type = Xsl
-_UI_DocumentRoot_xsl_feature = Xsl
+_UI_Xsl_type = XSL
+_UI_DocumentRoot_xsl_feature = XSL
_UI_Xsl_template_feature = Template
_UI_Xsl_use_feature = Use
_UI_Xsl_param_feature = Param
@@ -227,7 +227,7 @@
_UI_Xsl_applyOnElement_feature = Apply On Element
_UI_Xsl_applyOnElementNS_feature = Apply On Element NS
-_UI_DocumentRoot_outputStream_feature = Output Stream
+_UI_DocumentRoot_outputStream_feature = File Router
_UI_HighWaterMark_mark_feature = Mark
_UI_HighWaterMark_pollFrequency_feature = Poll Frequency
_UI_HighWaterMark_timeout_feature = Timeout
@@ -242,7 +242,7 @@
_UI_OutputStream_resourceName_feature = Resource Name
_UI_HighWaterMark_type = High Water Mark
-_UI_OutputStream_type = Output Stream
+_UI_OutputStream_type = File Router
# CSV
_UI_CsvDocumentRoot_type = Document Root
@@ -259,12 +259,12 @@
# DB routing
-_UI_Executor_type = Executor
+_UI_Executor_type = Database Router
_UI_ResultSet_type = Result Set
_UI_ResultSetRowSelector_type = Result Set Row Selector
-_UI_DocumentRoot_executor_feature = Executor
-_UI_DocumentRoot_resultSetRowSelector_feature = Result Set Row Selector
+_UI_DocumentRoot_executor_feature = Database Router
+_UI_DocumentRoot_resultSetRowSelector_feature = Resultset Row Selector
_UI_Executor_statement_feature = Statement
_UI_Executor_resultSet_feature = Result Set
_UI_Executor_datasource_feature = Datasource
@@ -306,7 +306,7 @@
_UI_HighWaterMark_type = High Water Mark
_UI_Jndi_type = Jndi
_UI_Message_type = Message
-_UI_JmsRouter_type = Jms Router
+_UI_JmsRouter_type = JMS Router
_UI_Session_type = Session
_UI_Connection_factory_feature = Factory
@@ -355,7 +355,7 @@
_UI_JsonDocumentRoot_type = Document Root
_UI_Key_type = Key
_UI_KeyMap_type = Key Map
-_UI_JsonReader_type =Json Reader
+_UI_JsonReader_type =JSON Reader
_UI_JsonDocumentRoot_mixed_feature = Mixed
_UI_JsonDocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map
@@ -387,7 +387,7 @@
# Data Source
_UI_Direct_type = Direct
_UI_DataSourceDocumentRoot_type = Data Source Document Root
-_UI_DataSourceJndi_type = Data Source Jndi
+_UI_DataSourceJndi_type = JNDI
_UI_AbstractReader_type = Abstract Reader
_UI_Direct_autoCommit_feature = Auto Commit
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/AddSmooksResourceAction.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/AddSmooksResourceAction.java 2009-05-11
09:09:42 UTC (rev 15148)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/AddSmooksResourceAction.java 2009-05-11
09:39:14 UTC (rev 15149)
@@ -10,11 +10,14 @@
******************************************************************************/
package org.jboss.tools.smooks.configuration.actions;
+import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPart;
+import org.jboss.tools.smooks.model.smooks.AbstractReader;
/**
* @author Dart (dpeng(a)redhat.com)
@@ -24,17 +27,17 @@
public AddSmooksResourceAction(EditingDomain editingDomain, ISelection selection, Object
descriptor) {
super(editingDomain, selection, descriptor);
- // TODO Auto-generated constructor stub
+ resetActionText();
}
public AddSmooksResourceAction(IEditorPart editorPart, ISelection selection, Object
descriptor) {
super(editorPart, selection, descriptor);
- // TODO Auto-generated constructor stub
+ resetActionText();
}
public AddSmooksResourceAction(IWorkbenchPart workbenchPart, ISelection selection,
Object descriptor) {
super(workbenchPart, selection, descriptor);
- // TODO Auto-generated constructor stub
+ resetActionText();
}
public Object getDescriptor() {
@@ -44,4 +47,22 @@
public void setDescriptor(Object descriptor) {
this.descriptor = descriptor;
}
+
+ protected void resetActionText(){
+ if(descriptor instanceof CommandParameter){
+ CommandParameter parameter = (CommandParameter)descriptor;
+ if(parameter.getValue() != null){
+ Object value = AdapterFactoryEditingDomain.unwrap(parameter.getValue());
+ if(value instanceof AbstractReader){
+// if(value instanceof JsonReader){
+// setText("JSON Reader");
+// }
+//
+// if(value instanceof ReaderType){
+// setText("Custome Reader");
+// }
+ }
+ }
+ }
+ }
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-11
09:09:42 UTC (rev 15148)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-11
09:39:14 UTC (rev 15149)
@@ -62,7 +62,6 @@
import org.jboss.tools.smooks.model.fileRouting.OutputStream;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
import org.jboss.tools.smooks.model.groovy.Groovy;
-import org.jboss.tools.smooks.model.iorouting.IORouter;
import org.jboss.tools.smooks.model.javabean.BindingsType;
import org.jboss.tools.smooks.model.jmsrouting.JmsRouter;
import org.jboss.tools.smooks.model.medi.EdiMap;
@@ -70,6 +69,7 @@
import org.jboss.tools.smooks.model.medi.MEdiPackage;
import org.jboss.tools.smooks.model.smooks.AbstractReader;
import org.jboss.tools.smooks.model.smooks.DocumentRoot;
+import org.jboss.tools.smooks.model.smooks.ReaderType;
import org.jboss.tools.smooks.model.smooks.SmooksFactory;
import org.jboss.tools.smooks.model.smooks.SmooksPackage;
import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
@@ -205,7 +205,7 @@
* @generated
*/
protected IMenuManager createSiblingMenuManager;
-
+
private ValidateSmooksAction validateSmooksAction;
/**
@@ -218,7 +218,7 @@
super(ADDITIONS_LAST_STYLE);
// loadResourceAction = new LoadResourceAction();
validateAction = new ValidateAction();
-// controlAction = new ControlAction();
+ // controlAction = new ControlAction();
}
protected void addMapNode() {
@@ -349,10 +349,10 @@
public void init(IActionBars actionBars) {
super.init(actionBars);
ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-
+
validateSmooksAction = new ValidateSmooksAction();
validateSmooksAction.setText("Validate");
-
+
cutAction = new CutAction() {
public void runWithEvent(Event event) {
@@ -447,7 +447,7 @@
EditingDomain domain = ((IEditingDomainProvider)
activeEditorPart).getEditingDomain();
newChildDescriptors = domain.getNewChildDescriptors(object, null);
-
+
validateSmooksAction.setResource(domain.getResourceSet().getResources().get(0));
validateSmooksAction.setEditingDomain(domain);
// newSiblingDescriptors = domain.getNewChildDescriptors(null,
@@ -586,23 +586,23 @@
public void menuAboutToShow(IMenuManager menuManager) {
menuManager.add(new Separator("edit"));
menuManager.add(new ActionContributionItem(undoAction));
- menuManager.add(new ActionContributionItem(redoAction));
- menuManager.add(new Separator());
- menuManager.add(new ActionContributionItem(deleteAction));
- menuManager.add(new Separator());
- menuManager.add(new ActionContributionItem(cutAction));
- menuManager.add(new ActionContributionItem(copyAction));
- menuManager.add(new ActionContributionItem(pasteAction));
- menuManager.add(new Separator());
+ menuManager.add(new ActionContributionItem(redoAction));
+ menuManager.add(new Separator());
+ menuManager.add(new ActionContributionItem(deleteAction));
+ menuManager.add(new Separator());
+ menuManager.add(new ActionContributionItem(cutAction));
+ menuManager.add(new ActionContributionItem(copyAction));
+ menuManager.add(new ActionContributionItem(pasteAction));
+ menuManager.add(new Separator());
-// if ((style & ADDITIONS_LAST_STYLE) != 0)
-// {
-// menuManager.add(new Separator("additions"));
-// menuManager.add(new Separator());
-// }
- // Add our other standard marker.
- //
- menuManager.add(new Separator("additions-end"));
+ // if ((style & ADDITIONS_LAST_STYLE) != 0)
+ // {
+ // menuManager.add(new Separator("additions"));
+ // menuManager.add(new Separator());
+ // }
+ // Add our other standard marker.
+ //
+ menuManager.add(new Separator("additions-end"));
MenuManager submenuManager = null;
updateRootElementAddAction();
@@ -621,7 +621,7 @@
submenuManager = new MenuManager("Add Smooks Resource");
if (isSmooksResourceListElement()) {
- groupActions(submenuManager,createChildActions);
+ groupActions(submenuManager, createChildActions);
} else {
populateManager(submenuManager, createChildActions, null);
}
@@ -631,7 +631,7 @@
populateManager(submenuManager, createSiblingActions, null);
menuManager.insertBefore("edit", submenuManager);
// don't show properties that
-// menuManager.insertAfter("additions-end", showPropertiesViewAction);
+ // menuManager.insertAfter("additions-end", showPropertiesViewAction);
menuManager.insertAfter("additions-end", validateSmooksAction);
this.addGlobalActions(menuManager);
}
@@ -646,8 +646,8 @@
return false;
}
- protected void groupActions(MenuManager manager,Collection<?> createChildActions)
{
- MenuManager readers = new MenuManager("Readers");
+ protected void groupActions(MenuManager manager, Collection<?> createChildActions)
{
+ MenuManager readers = new MenuManager("Reader");
manager.add(readers);
MenuManager templating = new MenuManager("Templating");
@@ -664,6 +664,9 @@
MenuManager fragmentRouting = new MenuManager("Fragment Routing");
manager.add(fragmentRouting);
+
+ MenuManager database = new MenuManager("Database");
+ manager.add(database);
for (Iterator<?> iterator = createChildActions.iterator(); iterator.hasNext();)
{
boolean added = false;
@@ -675,43 +678,123 @@
added = true;
}
if (isTemplate(descriptor)) {
- templating.add(action);added = true;
+ templating.add(action);
+ added = true;
}
if (isJavaBinding(descriptor)) {
- jbinding.add(action);added = true;
+ jbinding.add(action);
+ added = true;
}
if (isDatasources(descriptor)) {
- datasources.add(action);added = true;
+ datasources.add(action);
+ added = true;
}
+
+ if(isDatabaseDescriptor(descriptor)){
+ database.add(action);
+ added = true;
+ }
if (isScripting(descriptor)) {
- scripting.add(action);added = true;
+ scripting.add(action);
+ added = true;
}
if (isFragmentRouting(descriptor)) {
- fragmentRouting.add(action);added = true;
+ fragmentRouting.add(action);
+ added = true;
}
- if(!added){
+ if (!added) {
manager.add(action);
}
}
+
+ orderReaderAction(readers);
+ orderTemplateAction(templating);
+ orderJBindingAction(jbinding);
+ orderDatasourceAction(datasources);
+ orderScriptAction(scripting);
+ orderFragmentAction(fragmentRouting);
+ orderDatabaseAction(database);
}
- private boolean isFragmentRouting(Object descriptor) {
- if(descriptor instanceof CommandParameter){
- CommandParameter parameter = (CommandParameter)descriptor;
- if(parameter.getValue() != null){
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof JmsRouter){
- return true;
+ protected void orderDatabaseAction(MenuManager database) {
+ // TODO Auto-generated method stub
+
+ }
+
+ protected void orderScriptAction(MenuManager scripting) {
+ // TODO Auto-generated method stub
+
+ }
+
+ protected void orderFragmentAction(MenuManager fragmentRouting) {
+ // TODO Auto-generated method stub
+
+ }
+
+ protected void orderDatasourceAction(MenuManager datasources) {
+ // TODO Auto-generated method stub
+
+ }
+
+ protected void orderJBindingAction(MenuManager jbinding) {
+ // TODO Auto-generated method stub
+
+ }
+
+ protected void orderTemplateAction(MenuManager templating) {
+ // TODO Auto-generated method stub
+
+ }
+
+ protected void orderReaderAction(MenuManager readers) {
+ IContributionItem[] items = readers.getItems();
+ for (int i = 0; i < items.length; i++) {
+ IContributionItem item = items[i];
+ if (item instanceof ActionContributionItem) {
+ IAction action = ((ActionContributionItem) item).getAction();
+ if (action instanceof AddSmooksResourceAction) {
+ AddSmooksResourceAction action1 = (AddSmooksResourceAction) action;
+ Object descriptor = action1.getDescriptor();
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ Object value = AdapterFactoryEditingDomain.unwrap(parameter.getValue());
+ if (value instanceof ReaderType) {
+ int index = items.length - 1;
+ readers.remove(item);
+ readers.insert(index, item);
+ return;
+ }
+ }
+ }
}
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
OutputStream){
+ }
+ }
+ }
+
+ private boolean isDatabaseDescriptor(Object descriptor) {
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
ResultSetRowSelector) {
return true;
}
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof IORouter){
+ }
+ }
+ return false;
+ }
+
+ private boolean isFragmentRouting(Object descriptor) {
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof JmsRouter) {
return true;
}
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Executor){
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof OutputStream)
{
return true;
}
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
ResultSetRowSelector){
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Executor) {
return true;
}
}
@@ -720,10 +803,10 @@
}
private boolean isScripting(Object descriptor) {
- if(descriptor instanceof CommandParameter){
- CommandParameter parameter = (CommandParameter)descriptor;
- if(parameter.getValue() != null){
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Groovy){
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Groovy) {
return true;
}
}
@@ -732,13 +815,13 @@
}
private boolean isDatasources(Object descriptor) {
- if(descriptor instanceof CommandParameter){
- CommandParameter parameter = (CommandParameter)descriptor;
- if(parameter.getValue() != null){
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
DataSourceJndi){
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
DataSourceJndi) {
return true;
}
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Direct){
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Direct) {
return true;
}
}
@@ -747,10 +830,10 @@
}
private boolean isJavaBinding(Object descriptor) {
- if(descriptor instanceof CommandParameter){
- CommandParameter parameter = (CommandParameter)descriptor;
- if(parameter.getValue() != null){
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
BindingsType){
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof BindingsType)
{
return true;
}
}
@@ -759,13 +842,13 @@
}
private boolean isTemplate(Object descriptor) {
- if(descriptor instanceof CommandParameter){
- CommandParameter parameter = (CommandParameter)descriptor;
- if(parameter.getValue() != null){
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Freemarker){
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Freemarker)
{
return true;
}
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Xsl){
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Xsl) {
return true;
}
}
@@ -774,10 +857,10 @@
}
private boolean isReader(Object descriptor) {
- if(descriptor instanceof CommandParameter){
- CommandParameter parameter = (CommandParameter)descriptor;
- if(parameter.getValue() != null){
- if(AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
AbstractReader){
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter parameter = (CommandParameter) descriptor;
+ if (parameter.getValue() != null) {
+ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof
AbstractReader) {
return true;
}
}
@@ -823,13 +906,14 @@
*/
@Override
protected void addGlobalActions(IMenuManager menuManager) {
-// menuManager.insertAfter("additions-end", new
Separator("ui-actions"));
-// menuManager.insertAfter("additions-end", showPropertiesViewAction);
+ // menuManager.insertAfter("additions-end", new
+ // Separator("ui-actions"));
+ // menuManager.insertAfter("additions-end", showPropertiesViewAction);
-// refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-// menuManager.insertAfter("ui-actions", refreshViewerAction);
+ // refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+ // menuManager.insertAfter("ui-actions", refreshViewerAction);
-// super.addGlobalActions(menuManager);
+ // super.addGlobalActions(menuManager);
}
/**