JBoss Tools SVN: r19697 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: launch and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-11 14:37:16 -0500 (Mon, 11 Jan 2010)
New Revision: 19697
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/xpl/
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
Log:
JBIDE-5508 moved to xpl
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2010-01-11 19:28:42 UTC (rev 19696)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2010-01-11 19:37:16 UTC (rev 19697)
@@ -36,6 +36,7 @@
import org.eclipse.debug.ui.ILaunchConfigurationDialog;
import org.eclipse.debug.ui.ILaunchConfigurationTab;
import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
@@ -48,6 +49,7 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.ui.xpl.JavaMainTabClone;
/**
*
@@ -101,6 +103,10 @@
}
return true;
}
+ protected IJavaProject getJavaProject() {
+ return null;
+ }
+
}
public class JavaArgumentsTabExtension extends JavaArgumentsTab {
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java 2010-01-11 19:28:42 UTC (rev 19696)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java 2010-01-11 19:37:16 UTC (rev 19697)
@@ -1,314 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.launch;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.SWTFactory;
-import org.eclipse.jdt.internal.debug.ui.launcher.DebugTypeSelectionDialog;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.MainMethodSearchEngine;
-import org.eclipse.jdt.internal.debug.ui.launcher.SharedJavaMainTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class is only here because of all the pain in the ass
- * shit the jdt classes put in your way to prevent subclassing.
- *
- * Fuck that.
- */
-
-public class JavaMainTabClone extends SharedJavaMainTab {
- /**
- * Boolean launch configuration attribute indicating that external jars (on
- * the runtime classpath) should be searched when looking for a main type.
- * Default value is <code>false</code>.
- *
- * @since 2.1
- */
- public static final String ATTR_INCLUDE_EXTERNAL_JARS = IJavaDebugUIConstants.PLUGIN_ID + ".INCLUDE_EXTERNAL_JARS"; //$NON-NLS-1$
- /**
- * Boolean launch configuration attribute indicating whether types inheriting
- * a main method should be considered when searching for a main type.
- * Default value is <code>false</code>.
- *
- * @since 3.0
- */
- public static final String ATTR_CONSIDER_INHERITED_MAIN = IJavaDebugUIConstants.PLUGIN_ID + ".CONSIDER_INHERITED_MAIN"; //$NON-NLS-1$
-
- // UI widgets
- private Button fSearchExternalJarsCheckButton;
- private Button fConsiderInheritedMainButton;
- private Button fStopInMainCheckButton;
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_BOTH);
- ((GridLayout)comp.getLayout()).verticalSpacing = 0;
- createProjectEditor(comp);
- createVerticalSpacer(comp, 1);
- createMainTypeEditor(comp, LauncherMessages.JavaMainTab_Main_cla_ss__4);
- setControl(comp);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB);
- }
-
- /**
- * @see org.eclipse.jdt.internal.debug.ui.launcher.SharedJavaMainTab#createMainTypeExtensions(org.eclipse.swt.widgets.Composite)
- */
- protected void createMainTypeExtensions(Composite parent) {
- fSearchExternalJarsCheckButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_E_xt__jars_6, null, false, 2);
- fSearchExternalJarsCheckButton.addSelectionListener(getDefaultListener());
-
- fConsiderInheritedMainButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_22, null, false, 2);
- fConsiderInheritedMainButton.addSelectionListener(getDefaultListener());
-
- fStopInMainCheckButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_St_op_in_main_1, null, false, 1);
- fStopInMainCheckButton.addSelectionListener(getDefaultListener());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()
- */
- public Image getImage() {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
- */
- public String getName() {
- return LauncherMessages.JavaMainTab__Main_19;
- }
-
- /**
- * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getId()
- *
- * @since 3.3
- */
- public String getId() {
- return "org.eclipse.jdt.debug.ui.javaMainTab"; //$NON-NLS-1$
- }
-
- /**
- * Show a dialog that lists all main types
- */
- protected void handleSearchButtonSelected() {
- IJavaProject project = getJavaProject();
- IJavaElement[] elements = null;
- if ((project == null) || !project.exists()) {
- IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- if (model != null) {
- try {
- elements = model.getJavaProjects();
- }
- catch (JavaModelException e) {JDIDebugUIPlugin.log(e);}
- }
- }
- else {
- elements = new IJavaElement[]{project};
- }
- if (elements == null) {
- elements = new IJavaElement[]{};
- }
- int constraints = IJavaSearchScope.SOURCES;
- constraints |= IJavaSearchScope.APPLICATION_LIBRARIES;
- if (fSearchExternalJarsCheckButton.getSelection()) {
- constraints |= IJavaSearchScope.SYSTEM_LIBRARIES;
- }
- IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(elements, constraints);
- MainMethodSearchEngine engine = new MainMethodSearchEngine();
- IType[] types = null;
- try {
- types = engine.searchMainMethods(getLaunchConfigurationDialog(), searchScope, fConsiderInheritedMainButton.getSelection());
- }
- catch (InvocationTargetException e) {
- setErrorMessage(e.getMessage());
- return;
- }
- catch (InterruptedException e) {
- setErrorMessage(e.getMessage());
- return;
- }
- DebugTypeSelectionDialog mmsd = new DebugTypeSelectionDialog(getShell(), types, LauncherMessages.JavaMainTab_Choose_Main_Type_11);
- if (mmsd.open() == Window.CANCEL) {
- return;
- }
- Object[] results = mmsd.getResult();
- IType type = (IType)results[0];
- if (type != null) {
- fMainText.setText(type.getFullyQualifiedName());
- fProjText.setText(type.getJavaProject().getElementName());
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.internal.debug.ui.launcher.AbstractJavaMainTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
- */
- public void initializeFrom(ILaunchConfiguration config) {
- //super.initializeFrom(config);
- //updateProjectFromConfig(config);
- setCurrentLaunchConfiguration(config);
- updateMainTypeFromConfig(config);
- updateStopInMainFromConfig(config);
- updateInheritedMainsFromConfig(config);
- updateExternalJars(config);
- }
-
- private ILaunchConfiguration fLaunchConfig;
- protected ILaunchConfiguration getCurrentLaunchConfiguration() {
- return fLaunchConfig;
- }
- protected void setCurrentLaunchConfiguration(ILaunchConfiguration config) {
- fLaunchConfig = config;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
- */
- public boolean isValid(ILaunchConfiguration config) {
- setErrorMessage(null);
- setMessage(null);
- String name = fProjText.getText().trim();
- if (name.length() > 0) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(name, IResource.PROJECT);
- if (status.isOK()) {
- IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (!project.exists()) {
- setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_20, new String[] {name}));
- return false;
- }
- if (!project.isOpen()) {
- setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_21, new String[] {name}));
- return false;
- }
- }
- else {
- setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_19, new String[]{status.getMessage()}));
- return false;
- }
- }
- name = fMainText.getText().trim();
- if (name.length() == 0) {
- setErrorMessage(LauncherMessages.JavaMainTab_Main_type_not_specified_16);
- return false;
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
- */
- public void performApply(ILaunchConfigurationWorkingCopy config) {
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText().trim());
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, fMainText.getText().trim());
- mapResources(config);
-
- // attribute added in 2.1, so null must be used instead of false for backwards compatibility
- if (fStopInMainCheckButton.getSelection()) {
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, true);
- }
- else {
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, (String)null);
- }
-
- // attribute added in 2.1, so null must be used instead of false for backwards compatibility
- if (fSearchExternalJarsCheckButton.getSelection()) {
- config.setAttribute(ATTR_INCLUDE_EXTERNAL_JARS, true);
- }
- else {
- config.setAttribute(ATTR_INCLUDE_EXTERNAL_JARS, (String)null);
- }
-
- // attribute added in 3.0, so null must be used instead of false for backwards compatibility
- if (fConsiderInheritedMainButton.getSelection()) {
- config.setAttribute(ATTR_CONSIDER_INHERITED_MAIN, true);
- }
- else {
- config.setAttribute(ATTR_CONSIDER_INHERITED_MAIN, (String)null);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
- */
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- IJavaElement javaElement = getContext();
- if (javaElement != null) {
- initializeJavaProject(javaElement, config);
- }
- else {
- config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING);
- }
- initializeMainTypeAndName(javaElement, config);
- }
-
- /**
- * updates the external jars attribute from the specified launch config
- * @param config the config to load from
- */
- protected void updateExternalJars(ILaunchConfiguration config) {
- boolean search = false;
- try {
- search = config.getAttribute(ATTR_INCLUDE_EXTERNAL_JARS, false);
- }
- catch (CoreException e) {JDIDebugUIPlugin.log(e);}
- fSearchExternalJarsCheckButton.setSelection(search);
- }
-
- /**
- * update the inherited mains attribute from the specified launch config
- * @param config the config to load from
- */
- protected void updateInheritedMainsFromConfig(ILaunchConfiguration config) {
- boolean inherit = false;
- try {
- inherit = config.getAttribute(ATTR_CONSIDER_INHERITED_MAIN, false);
- }
- catch (CoreException e) {JDIDebugUIPlugin.log(e);}
- fConsiderInheritedMainButton.setSelection(inherit);
- }
-
- /**
- * updates the stop in main attribute from the specified launch config
- * @param config the config to load the stop in main attribute from
- */
- protected void updateStopInMainFromConfig(ILaunchConfiguration config) {
- boolean stop = false;
- try {
- stop = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, false);
- }
- catch (CoreException e) {JDIDebugUIPlugin.log(e);}
- fStopInMainCheckButton.setSelection(stop);
- }
-
-}
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java (from rev 19669, trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java 2010-01-11 19:37:16 UTC (rev 19697)
@@ -0,0 +1,314 @@
+package org.jboss.ide.eclipse.as.ui.xpl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaModel;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.search.IJavaSearchScope;
+import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
+import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
+import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
+import org.eclipse.jdt.internal.debug.ui.SWTFactory;
+import org.eclipse.jdt.internal.debug.ui.launcher.DebugTypeSelectionDialog;
+import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
+import org.eclipse.jdt.internal.debug.ui.launcher.MainMethodSearchEngine;
+import org.eclipse.jdt.internal.debug.ui.launcher.SharedJavaMainTab;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.ui.ISharedImages;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * This class is only here because of all the pain in the ass
+ * shit the jdt classes put in your way to prevent subclassing.
+ *
+ * Fuck that.
+ */
+
+public class JavaMainTabClone extends SharedJavaMainTab {
+ /**
+ * Boolean launch configuration attribute indicating that external jars (on
+ * the runtime classpath) should be searched when looking for a main type.
+ * Default value is <code>false</code>.
+ *
+ * @since 2.1
+ */
+ public static final String ATTR_INCLUDE_EXTERNAL_JARS = IJavaDebugUIConstants.PLUGIN_ID + ".INCLUDE_EXTERNAL_JARS"; //$NON-NLS-1$
+ /**
+ * Boolean launch configuration attribute indicating whether types inheriting
+ * a main method should be considered when searching for a main type.
+ * Default value is <code>false</code>.
+ *
+ * @since 3.0
+ */
+ public static final String ATTR_CONSIDER_INHERITED_MAIN = IJavaDebugUIConstants.PLUGIN_ID + ".CONSIDER_INHERITED_MAIN"; //$NON-NLS-1$
+
+ // UI widgets
+ private Button fSearchExternalJarsCheckButton;
+ private Button fConsiderInheritedMainButton;
+ private Button fStopInMainCheckButton;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
+ */
+ public void createControl(Composite parent) {
+ Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_BOTH);
+ ((GridLayout)comp.getLayout()).verticalSpacing = 0;
+ createProjectEditor(comp);
+ createVerticalSpacer(comp, 1);
+ createMainTypeEditor(comp, LauncherMessages.JavaMainTab_Main_cla_ss__4);
+ setControl(comp);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB);
+ }
+
+ /**
+ * @see org.eclipse.jdt.internal.debug.ui.launcher.SharedJavaMainTab#createMainTypeExtensions(org.eclipse.swt.widgets.Composite)
+ */
+ protected void createMainTypeExtensions(Composite parent) {
+ fSearchExternalJarsCheckButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_E_xt__jars_6, null, false, 2);
+ fSearchExternalJarsCheckButton.addSelectionListener(getDefaultListener());
+
+ fConsiderInheritedMainButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_22, null, false, 2);
+ fConsiderInheritedMainButton.addSelectionListener(getDefaultListener());
+
+ fStopInMainCheckButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_St_op_in_main_1, null, false, 1);
+ fStopInMainCheckButton.addSelectionListener(getDefaultListener());
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()
+ */
+ public Image getImage() {
+ return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
+ */
+ public String getName() {
+ return LauncherMessages.JavaMainTab__Main_19;
+ }
+
+ /**
+ * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getId()
+ *
+ * @since 3.3
+ */
+ public String getId() {
+ return "org.eclipse.jdt.debug.ui.javaMainTab"; //$NON-NLS-1$
+ }
+
+ /**
+ * Show a dialog that lists all main types
+ */
+ protected void handleSearchButtonSelected() {
+ IJavaProject project = getJavaProject();
+ IJavaElement[] elements = null;
+ if ((project == null) || !project.exists()) {
+ IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
+ if (model != null) {
+ try {
+ elements = model.getJavaProjects();
+ }
+ catch (JavaModelException e) {JDIDebugUIPlugin.log(e);}
+ }
+ }
+ else {
+ elements = new IJavaElement[]{project};
+ }
+ if (elements == null) {
+ elements = new IJavaElement[]{};
+ }
+ int constraints = IJavaSearchScope.SOURCES;
+ constraints |= IJavaSearchScope.APPLICATION_LIBRARIES;
+ if (fSearchExternalJarsCheckButton.getSelection()) {
+ constraints |= IJavaSearchScope.SYSTEM_LIBRARIES;
+ }
+ IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(elements, constraints);
+ MainMethodSearchEngine engine = new MainMethodSearchEngine();
+ IType[] types = null;
+ try {
+ types = engine.searchMainMethods(getLaunchConfigurationDialog(), searchScope, fConsiderInheritedMainButton.getSelection());
+ }
+ catch (InvocationTargetException e) {
+ setErrorMessage(e.getMessage());
+ return;
+ }
+ catch (InterruptedException e) {
+ setErrorMessage(e.getMessage());
+ return;
+ }
+ DebugTypeSelectionDialog mmsd = new DebugTypeSelectionDialog(getShell(), types, LauncherMessages.JavaMainTab_Choose_Main_Type_11);
+ if (mmsd.open() == Window.CANCEL) {
+ return;
+ }
+ Object[] results = mmsd.getResult();
+ IType type = (IType)results[0];
+ if (type != null) {
+ fMainText.setText(type.getFullyQualifiedName());
+ fProjText.setText(type.getJavaProject().getElementName());
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jdt.internal.debug.ui.launcher.AbstractJavaMainTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
+ */
+ public void initializeFrom(ILaunchConfiguration config) {
+ //super.initializeFrom(config);
+ //updateProjectFromConfig(config);
+ setCurrentLaunchConfiguration(config);
+ updateMainTypeFromConfig(config);
+ updateStopInMainFromConfig(config);
+ updateInheritedMainsFromConfig(config);
+ updateExternalJars(config);
+ }
+
+ private ILaunchConfiguration fLaunchConfig;
+ protected ILaunchConfiguration getCurrentLaunchConfiguration() {
+ return fLaunchConfig;
+ }
+ protected void setCurrentLaunchConfiguration(ILaunchConfiguration config) {
+ fLaunchConfig = config;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
+ */
+ public boolean isValid(ILaunchConfiguration config) {
+ setErrorMessage(null);
+ setMessage(null);
+ String name = fProjText.getText().trim();
+ if (name.length() > 0) {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IStatus status = workspace.validateName(name, IResource.PROJECT);
+ if (status.isOK()) {
+ IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+ if (!project.exists()) {
+ setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_20, new String[] {name}));
+ return false;
+ }
+ if (!project.isOpen()) {
+ setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_21, new String[] {name}));
+ return false;
+ }
+ }
+ else {
+ setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_19, new String[]{status.getMessage()}));
+ return false;
+ }
+ }
+ name = fMainText.getText().trim();
+ if (name.length() == 0) {
+ setErrorMessage(LauncherMessages.JavaMainTab_Main_type_not_specified_16);
+ return false;
+ }
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
+ */
+ public void performApply(ILaunchConfigurationWorkingCopy config) {
+ //config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText().trim());
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, fMainText.getText().trim());
+ mapResources(config);
+
+ // attribute added in 2.1, so null must be used instead of false for backwards compatibility
+ if (fStopInMainCheckButton.getSelection()) {
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, true);
+ }
+ else {
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, (String)null);
+ }
+
+ // attribute added in 2.1, so null must be used instead of false for backwards compatibility
+ if (fSearchExternalJarsCheckButton.getSelection()) {
+ config.setAttribute(ATTR_INCLUDE_EXTERNAL_JARS, true);
+ }
+ else {
+ config.setAttribute(ATTR_INCLUDE_EXTERNAL_JARS, (String)null);
+ }
+
+ // attribute added in 3.0, so null must be used instead of false for backwards compatibility
+ if (fConsiderInheritedMainButton.getSelection()) {
+ config.setAttribute(ATTR_CONSIDER_INHERITED_MAIN, true);
+ }
+ else {
+ config.setAttribute(ATTR_CONSIDER_INHERITED_MAIN, (String)null);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
+ */
+ public void setDefaults(ILaunchConfigurationWorkingCopy config) {
+ IJavaElement javaElement = getContext();
+ if (javaElement != null) {
+ initializeJavaProject(javaElement, config);
+ }
+ else {
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING);
+ }
+ initializeMainTypeAndName(javaElement, config);
+ }
+
+ /**
+ * updates the external jars attribute from the specified launch config
+ * @param config the config to load from
+ */
+ protected void updateExternalJars(ILaunchConfiguration config) {
+ boolean search = false;
+ try {
+ search = config.getAttribute(ATTR_INCLUDE_EXTERNAL_JARS, false);
+ }
+ catch (CoreException e) {JDIDebugUIPlugin.log(e);}
+ fSearchExternalJarsCheckButton.setSelection(search);
+ }
+
+ /**
+ * update the inherited mains attribute from the specified launch config
+ * @param config the config to load from
+ */
+ protected void updateInheritedMainsFromConfig(ILaunchConfiguration config) {
+ boolean inherit = false;
+ try {
+ inherit = config.getAttribute(ATTR_CONSIDER_INHERITED_MAIN, false);
+ }
+ catch (CoreException e) {JDIDebugUIPlugin.log(e);}
+ fConsiderInheritedMainButton.setSelection(inherit);
+ }
+
+ /**
+ * updates the stop in main attribute from the specified launch config
+ * @param config the config to load the stop in main attribute from
+ */
+ protected void updateStopInMainFromConfig(ILaunchConfiguration config) {
+ boolean stop = false;
+ try {
+ stop = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, false);
+ }
+ catch (CoreException e) {JDIDebugUIPlugin.log(e);}
+ fStopInMainCheckButton.setSelection(stop);
+ }
+
+}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19696 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-11 14:28:42 -0500 (Mon, 11 Jan 2010)
New Revision: 19696
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java
Log:
JBIDE-5636 - not deploying output folders
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2010-01-11 17:16:02 UTC (rev 19695)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2010-01-11 19:28:42 UTC (rev 19696)
@@ -18,7 +18,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.componentcore.util.EARVirtualRootFolder;
import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
@@ -30,10 +29,8 @@
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.builder.DependencyGraphManager;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder;
import org.eclipse.wst.common.componentcore.internal.util.IComponentImplFactory;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -73,9 +70,9 @@
*/
public IVirtualReference[] getReferences() {
- IVirtualReference[] cached = getCachedReferences();
- if (cached != null)
- return cached;
+// IVirtualReference[] cached = getCachedReferences();
+// if (cached != null)
+// return cached;
cachedReferences = getHardReferences(this);
return cachedReferences;
}
@@ -110,8 +107,10 @@
if (vReference != null) {
IVirtualComponent referencedIVirtualComponent = vReference.getReferencedComponent();
if (referencedIVirtualComponent != null && referencedIVirtualComponent.exists()) {
- String archiveName = getArchiveName(referencedIVirtualComponent, referencedComponent);
- vReference.setArchiveName(archiveName);
+ if( vReference.getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_USES ) {
+ String archiveName = getArchiveName(referencedIVirtualComponent, referencedComponent);
+ vReference.setArchiveName(archiveName);
+ }
hardReferences.add(vReference);
}
}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19695 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-01-11 12:16:02 -0500 (Mon, 11 Jan 2010)
New Revision: 19695
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5417 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-11 15:36:45 UTC (rev 19694)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-01-11 17:16:02 UTC (rev 19695)
@@ -11,6 +11,7 @@
package org.hibernate.eclipse.jdt.ui.wizards;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
@@ -68,8 +69,10 @@
import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages;
import org.hibernate.eclipse.jdt.ui.internal.jpa.collect.AllEntitiesInfoCollector;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo;
+import org.hibernate.eclipse.jdt.ui.internal.jpa.common.Utils;
import org.hibernate.tool.hbm2x.HibernateMappingExporter;
import org.hibernate.tool.hbm2x.HibernateMappingGlobalSettings;
+import org.hibernate.tool.hbm2x.pojo.POJOClass;
/**
* @author Dmitry Geraskov
@@ -212,6 +215,42 @@
}
this.selection = new StructuredSelection(filteredElements.toArray());
}
+
+ protected class HibernateMappingExporter2 extends HibernateMappingExporter {
+ protected IJavaProject proj;
+ public HibernateMappingExporter2(IJavaProject proj, Configuration cfg, File outputdir) {
+ super(cfg, outputdir);
+ this.proj = proj;
+ }
+ /**
+ * redefine base exportPOJO to setup right output dir in case
+ * of several source folders
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void exportPOJO(Map additionalContext, POJOClass element) {
+ File outputdir4File = getOutputDirectory();
+ String fullyQualifiedName = element.getQualifiedDeclarationName();
+ ICompilationUnit icu = Utils.findCompilationUnit(proj, fullyQualifiedName);
+ if (icu != null) {
+ IResource resource = null;
+ try {
+ resource = icu.getCorrespondingResource();
+ } catch (JavaModelException e) {
+ //ignore
+ }
+ int n = fullyQualifiedName.split("\\.").length; //$NON-NLS-1$
+ for ( ; n > 0 && resource != null; n--) {
+ resource = resource.getParent();
+ }
+ if (resource != null) {
+ outputdir4File = resource.getLocation().toFile();
+ }
+ }
+ setOutputDirectory(outputdir4File);
+ super.exportPOJO(additionalContext, element);
+ }
+ }
@Override
public boolean performFinish() {
@@ -256,12 +295,11 @@
IFolder temp_folder = entry.getKey().getProject().getFolder(new Path(".settings/org.hibernate_tools.temp"));
*/
- IResource container = entry.getKey().getPackageFragmentRoots().length > 0
- ? entry.getKey().getPackageFragmentRoots()[0].getResource()
- : entry.getKey().getResource();
+ IPackageFragmentRoot[] pfRoots = entry.getKey().getPackageFragmentRoots();
+ IResource container = pfRoots.length > 0 ? pfRoots[0].getResource() : entry.getKey().getResource();
- HibernateMappingExporter hce = new HibernateMappingExporter(config,
- container.getLocation().toFile());
+ HibernateMappingExporter2 hce = new HibernateMappingExporter2(
+ entry.getKey(), config, container.getLocation().toFile());
hce.setGlobalSettings(hmgs);
//hce.setForEach("entity");
@@ -271,7 +309,12 @@
} catch (Exception e){
e.getCause().printStackTrace();
}
- container.refreshLocal(IResource.DEPTH_INFINITE, null);
+ for (int i = 0; i < pfRoots.length; i++) {
+ container = pfRoots[i].getResource();
+ if (container != null && container.getType() != IResource.FILE) {
+ container.refreshLocal(IResource.DEPTH_INFINITE, null);
+ }
+ }
} catch (JavaModelException e1) {
HibernateConsolePlugin.getDefault().log(e1);
} catch (CoreException e) {
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19694 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-11 10:36:45 -0500 (Mon, 11 Jan 2010)
New Revision: 19694
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5609
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2010-01-11 14:46:16 UTC (rev 19693)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2010-01-11 15:36:45 UTC (rev 19694)
@@ -108,6 +108,10 @@
name="http://jboss.com/products/seam/pages-2.1.xsd"
uri="platform:/plugin/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd"/>
+ <uri
+ name="http://jboss.com/products/seam/pages-2.2.xsd"
+ uri="platform:/plugin/org.jboss.tools.seam.pages.xml/schemas/pages-2.2.xsd"/>
+
</catalogContribution>
</extension>
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19693 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-11 09:46:16 -0500 (Mon, 11 Jan 2010)
New Revision: 19693
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5651 - fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-01-11 14:39:50 UTC (rev 19692)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-01-11 14:46:16 UTC (rev 19693)
@@ -1,4 +1,4 @@
-AATTRIBUTES_MENU_ITEM=<{0}> Attributes
+ATTRIBUTES_MENU_ITEM=<{0}> Attributes
SELECT_THIS_TAG_MENU_ITEM=Select This Tag
STRIP_TAG_MENU_ITEM=Strip Tag
PARENT_TAG_MENU_ITEM=Parent Tag ({0})
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19692 - in trunk/esb/plugins/org.jboss.tools.esb.core: src/org/jboss/tools/esb/core/model/converters and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-11 09:39:50 -0500 (Mon, 11 Jan 2010)
New Revision: 19692
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationListConverter.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5554
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-11 14:29:29 UTC (rev 19691)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-11 14:39:50 UTC (rev 19692)
@@ -2744,6 +2744,8 @@
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
<XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
@@ -2797,25 +2799,10 @@
PROPERTIES="actionList=CreateActions" displayName="Target..."
kind="action" name="AddAnyTarget"/>
</XActionItem>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="Properties"/>
+ <XActionItemReference entity="ESBPreNotificationList" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-01-11 14:29:29 UTC (rev 19691)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-01-11 14:39:50 UTC (rev 19692)
@@ -17,6 +17,44 @@
<GlobalActions kind="list"/>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="attachment" name="ESBPreNotifyAttachment">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="attachment" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="file" xmlname="#text">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="linkAction=OpenFile"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty" PROPERTIES="actionpath=Open;attribute=file"
+ displayName="Open File" kind="action" name="OpenFile"/>
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="column" name="ESBPreNotifyColumn">
<XChildrenEntities/>
<XEntityRenderer>
@@ -30,8 +68,7 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
- <XModelAttribute PROPERTIES="category=general" name="value"
- visibility="false" xmlname="value"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -87,6 +124,62 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="ftp" name="ESBPreNotifyFTPList">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="ftp list" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="url" xmlname="URL"/>
+ <XModelAttribute PROPERTIES="category=general" name="file name" xmlname="filename">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="linkAction=OpenFile"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="list files" xmlname="listFiles">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general"
+ name="delete list file" xmlname="deletelistFile">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty" PROPERTIES="actionpath=Open;attribute=file name"
+ displayName="Open File" kind="action" name="OpenFile"/>
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="file" name="ESBPreNotifyFile">
<XChildrenEntities/>
<XEntityRenderer>
@@ -100,8 +193,7 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="uri" xmlname="URI"/>
- <XModelAttribute PROPERTIES="category=general" name="append"
- visibility="false" xmlname="append">
+ <XModelAttribute PROPERTIES="category=general" name="append" xmlname="append">
<Constraint loader="ListString">
<value/>
<value name="true"/>
@@ -125,6 +217,135 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="messageProp" name="ESBPreNotifyProp">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="message property" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="queue" name="ESBPreNotifyQueue">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="queue" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="jndi name" xmlname="jndiName"/>
+ <XModelAttribute PROPERTIES="category=general" name="jndi url" xmlname="jndi-URL"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="jndi context factory" xmlname="jndi-context-factory"/>
+ <XModelAttribute PROPERTIES="category=general" name="jndi pkg prefix" xmlname="jndi-pkg-prefix"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="connection factory" xmlname="connection-factory"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="destination" name="ESBPreNotifyTCP">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="destination" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="uri" xmlname="URI"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty" PROPERTIES="actionpath=Open;attribute=file name"
+ displayName="Open File" kind="action" name="OpenFile"/>
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="topic" name="ESBPreNotifyTopic">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="topic" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="jndi name" xmlname="jndiName"/>
+ <XModelAttribute PROPERTIES="category=general" name="jndi url" xmlname="jndi-URL"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="jndi context factory" xmlname="jndi-context-factory"/>
+ <XModelAttribute PROPERTIES="category=general" name="jndi pkg prefix" xmlname="jndi-pkg-prefix"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="connection factory" xmlname="connection-factory"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="target" name="ESBPreTargetNotifyConsole">
<XChildrenEntities/>
<XEntityRenderer>
@@ -156,6 +377,54 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="target" name="ESBPreTargetNotifyEmail">
+ <XChildrenEntities>
+ <XChildEntity name="ESBPreNotifyAttachment"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="target notify email" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ default="NotifyEmail" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="from" xmlname="from"/>
+ <XModelAttribute PROPERTIES="category=general" name="send to" xmlname="sendTo"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="copy to" xmlname="ccTo"/>
+ <XModelAttribute PROPERTIES="category=general" name="subject" xmlname="subject"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="message" xmlname="message"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="attachment name" xmlname="msgAttachmentName"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Attachment..." kind="action" name="CreateAttachment">
+ <EntityData EntityName="ESBPreNotifyAttachment">
+ <AttributeData AttributeName="file"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="target" name="ESBPreTargetNotifyFTP">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyFTP"/>
@@ -197,6 +466,51 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="target" name="ESBPreTargetNotifyFTPList">
+ <XChildrenEntities>
+ <XChildEntity name="ESBPreNotifyFTPList"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="target notify FTP list"
+ loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ default="NotifyFTPList" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ WizardClassName="%Default%" displayName="Add FTP List..."
+ kind="action" name="CreateFTPList">
+ <EntityData EntityName="ESBPreNotifyFTPList">
+ <AttributeData AttributeName="url"/>
+ <AttributeData AttributeName="file name" Mandatory="no"/>
+ <AttributeData AttributeName="list files" Mandatory="no"/>
+ <AttributeData AttributeName="delete list file" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="target" name="ESBPreTargetNotifyFiles">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyFile"/>
@@ -238,6 +552,57 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="target" name="ESBPreTargetNotifyQueues">
+ <XChildrenEntities>
+ <XChildEntity name="ESBPreNotifyProp"/>
+ <XChildEntity name="ESBPreNotifyQueue"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="target notify queues" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ default="NotifyQueues" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ WizardClassName="%Default%" displayName="Add Message Property..."
+ kind="action" name="CreateProp">
+ <EntityData EntityName="ESBPreNotifyProp">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ WizardClassName="%Default%" displayName="Add Queue..."
+ kind="action" name="CreateQueue">
+ <EntityData EntityName="ESBPreNotifyQueue">
+ <AttributeData AttributeName="jndi name"/>
+ <AttributeData AttributeName="jndi url" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
XMLSUBPATH="target" name="ESBPreTargetNotifySQLTable">
<XChildrenEntities>
<XChildEntity name="ESBPreNotifyColumn"/>
@@ -287,12 +652,108 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="target" name="ESBPreTargetNotifyTCP">
+ <XChildrenEntities>
+ <XChildEntity name="ESBPreNotifyTCP"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="target notify TCP" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ default="NotifyTCP" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ WizardClassName="%Default%" displayName="Add TCP..." kind="action" name="CreateTCP">
+ <EntityData EntityName="ESBPreNotifyTCP">
+ <AttributeData AttributeName="uri"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="target" name="ESBPreTargetNotifyTopics">
+ <XChildrenEntities>
+ <XChildEntity name="ESBPreNotifyProp"/>
+ <XChildEntity name="ESBPreNotifyTopic"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="target notify topics" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ default="NotifyTopics" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ WizardClassName="%Default%" displayName="Add Message Property..."
+ kind="action" name="CreateProp">
+ <EntityData EntityName="ESBPreNotifyProp">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ WizardClassName="%Default%" displayName="Add Topic..."
+ kind="action" name="CreateTopic">
+ <EntityData EntityName="ESBPreNotifyTopic">
+ <AttributeData AttributeName="jndi name"/>
+ <AttributeData AttributeName="jndi url" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XEntityExtension name="ESBPreNotificationList120">
<XChildrenEntities>
<XChildEntity maxCount="1" name="ESBPreTargetNotifyConsole"/>
+ <XChildEntity name="ESBPreTargetNotifyEmail"/>
<XChildEntity maxCount="1" name="ESBPreTargetNotifyFiles"/>
<XChildEntity maxCount="1" name="ESBPreTargetNotifySQLTable"/>
<XChildEntity maxCount="1" name="ESBPreTargetNotifyFTP"/>
+ <XChildEntity maxCount="1" name="ESBPreTargetNotifyFTPList"/>
+ <XChildEntity name="ESBPreTargetNotifyQueues"/>
+ <XChildEntity name="ESBPreTargetNotifyTCP"/>
+ <XChildEntity name="ESBPreTargetNotifyTopics"/>
</XChildrenEntities>
<XActionItem kind="list">
<XActionItem displayName="New" group="1" kind="list" name="CreateActions">
@@ -307,6 +768,16 @@
</XActionItem>
<XActionItem HandlerClassName="%DefaultReplaceUnique%"
ICON="action.empty"
+ PROPERTIES="child=NotifyEmail;significanceMessageClass=%Replace%"
+ displayName="Notify Email..." kind="action" name="CreateTargetNotifyEmail">
+ <EntityData EntityName="ESBPreTargetNotifyEmail">
+ <AttributeData AttributeName="from"/>
+ <AttributeData AttributeName="send to"/>
+ <AttributeData AttributeName="subject"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
PROPERTIES="child=NotifyFiles;significanceMessageClass=%Replace%"
displayName="Notify Files..." kind="action" name="CreateTargetNotifyFiles">
<EntityData EntityName="ESBPreTargetNotifyFiles">
@@ -323,6 +794,22 @@
</XActionItem>
<XActionItem HandlerClassName="%DefaultReplaceUnique%"
ICON="action.empty"
+ PROPERTIES="child=NotifyFTPList;significanceMessageClass=%Replace%"
+ displayName="Notify FTP List..." kind="action" name="CreateTargetNotifyFTPList">
+ <EntityData EntityName="ESBPreTargetNotifyFTPList">
+ <AttributeData AttributeName="class"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="child=NotifyQueues;significanceMessageClass=%Replace%"
+ displayName="Notify Queues..." kind="action" name="CreateTargetNotifyQueues">
+ <EntityData EntityName="ESBPreTargetNotifyQueues">
+ <AttributeData AttributeName="class"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
PROPERTIES="child=NotifySQLTable;significanceMessageClass=%Replace%"
WizardClassName="%Default%" displayName="Notify SQL Table..."
kind="action" name="CreateTargetNotifySQLTable">
@@ -336,6 +823,22 @@
<AttributeData AttributeName="data column" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="child=NotifyTCP;significanceMessageClass=%Replace%"
+ displayName="Notify TCP..." kind="action" name="CreateTargetNotifyTCP">
+ <EntityData EntityName="ESBPreTargetNotifyTCP">
+ <AttributeData AttributeName="class"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="child=NotifyTopics;significanceMessageClass=%Replace%"
+ displayName="Notify Topics..." kind="action" name="CreateTargetNotifyTopics">
+ <EntityData EntityName="ESBPreTargetNotifyTopics">
+ <AttributeData AttributeName="class"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
</XActionItem>
</XActionItem>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2010-01-11 14:29:29 UTC (rev 19691)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2010-01-11 14:39:50 UTC (rev 19692)
@@ -34,7 +34,7 @@
protected abstract String getItemEntityName();
public void toSpecific(XModelObject basicAction, XModelObject specificAction) {
- XModelObject p = basicAction.getChildByPath(getPropertyName());
+ XModelObject p = getBasicProperty(basicAction);
if(p == null) return;
XModelObject[] as = p.getChildren();
for (int i = 0; i < as.length; i++) {
@@ -48,6 +48,10 @@
p.removeFromParent();
}
+ protected XModelObject getBasicProperty(XModelObject basicAction) {
+ return basicAction.getChildByPath(getPropertyName());
+ }
+
public void toBasic(XModelObject basicAction, XModelObject specificAction) {
XModelObject[] as = specificAction.getChildren(getItemEntityName());
if(as.length == 0) return;
@@ -63,6 +67,7 @@
public XModelObject fromAnyElement(XModelObject any, String toEntity) {
String tag = any.getAttributeValue("tag");
Map<String, String> attr = toMap(((AnyElementObjectImpl)any).getAttributes());
+ attr.put("#text", "" + any.getAttributeValue("text"));
XModelObject a = any.getModel().createModelObject(toEntity, null);
if(!isRelevantTag(tag, a)) {
@@ -125,10 +130,14 @@
if(value == null || value.length() == 0 || value.equals(attrs[j].getDefaultValue())) {
if(!"always".equals(attrs[j].getProperty("save"))) continue;
}
- if(sb.length() > 0) {
- sb.append(';');
+ if("#text".equals(xml)) {
+ t.setAttributeValue("text", value);
+ } else {
+ if(sb.length() > 0) {
+ sb.append(';');
+ }
+ sb.append(xml).append('=').append(value);
}
- sb.append(xml).append('=').append(value);
}
String attributes = sb.toString();
t.setAttributeValue("attributes", attributes);
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationListConverter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationListConverter.java 2010-01-11 14:29:29 UTC (rev 19691)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationListConverter.java 2010-01-11 14:39:50 UTC (rev 19692)
@@ -29,6 +29,20 @@
super(propertyName, itemEntityName);
}
+ protected XModelObject getBasicProperty(XModelObject basicAction) {
+ XModelObject result = super.getBasicProperty(basicAction);
+ if(result != null) return result;
+ XModelObject[] ps = basicAction.getChildren();
+ for (XModelObject p: ps) {
+ XModelObject[] as = p.getChildren();
+ if(as.length > 0) {
+ String tag = as[0].getAttributeValue("tag");
+ if("NotificationList".equals(tag)) return p;
+ }
+ }
+ return null;
+ }
+
protected String getToChildEntity(XModelObject any, XModelEntity parent) {
if(ENT_ESB_NOTIFICATION_120.equals(parent.getName())) {
String tag = any.getAttributeValue("tag");
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19691 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-11 09:29:29 -0500 (Mon, 11 Jan 2010)
New Revision: 19691
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/SetupTemplateAction.java
Log:
Title for warning message box was added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/SetupTemplateAction.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/SetupTemplateAction.java 2010-01-11 13:58:36 UTC (rev 19690)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/SetupTemplateAction.java 2010-01-11 14:29:29 UTC (rev 19691)
@@ -83,6 +83,7 @@
} else {
MessageBox message = new MessageBox(shell, SWT.ICON_WARNING | SWT.OK);
message.setMessage(VpeUIMessages.NAMESPACE_NOT_DEFINED);
+ message.setText("Warning"); //$NON-NLS-1$
message.open();
}
if (data != null && data.isChanged())
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19690 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-11 08:58:36 -0500 (Mon, 11 Jan 2010)
New Revision: 19690
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5648 - fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java 2010-01-11 09:22:32 UTC (rev 19689)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesPreferencePage.java 2010-01-11 13:58:36 UTC (rev 19690)
@@ -232,6 +232,7 @@
public void handleEvent(Event event) {
Widget source = event.widget;
+ int selectIndex = tagsTable.getSelectionIndex();
if (source == addButton) {
/*
* Handle add event
@@ -250,18 +251,23 @@
/*
* Handle edit event
*/
- VpeAnyData data = (VpeAnyData) tagsList.get(tagsTable.getSelectionIndex());
- VpeEditAnyDialog editDialog = new VpeEditAnyDialog(getShell(), data);
- editDialog.open();
- if(data.isChanged()) {
- tagListWasChanged = true;
+ if (selectIndex > -1) {
+ VpeAnyData data = (VpeAnyData) tagsList.get(selectIndex);
+ VpeEditAnyDialog editDialog = new VpeEditAnyDialog(getShell(), data);
+ editDialog.open();
+ if(data.isChanged()) {
+ tagListWasChanged = true;
+ }
}
} else if (source == removeButton) {
/*
* Handle remove event
*/
- tagsList.remove(tagsTable.getSelectionIndex());
- tagListWasChanged = true;
+ if (selectIndex > -1) {
+ tagsTable.remove(selectIndex);
+ tagsList.remove(selectIndex);
+ tagListWasChanged = true;
+ }
} else {
/*
* Handle default event
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19689 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-11 04:22:32 -0500 (Mon, 11 Jan 2010)
New Revision: 19689
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5554
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-01-11 08:51:21 UTC (rev 19688)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-01-11 09:22:32 UTC (rev 19689)
@@ -27,14 +27,6 @@
private static final String SETTINGS_SECTION_NAME = "CDIValidatorConfigurationBlock";
- private static SectionDescription SECTION_TEST = new SectionDescription(
- CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_test,
- new String[][]{
- {CDIPreferences.TEST, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_test_label}
- },
- CDICorePlugin.PLUGIN_ID
- );
-
private static SectionDescription SECTION_NAME = new SectionDescription(
CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_name,
new String[][]{
@@ -66,7 +58,16 @@
private static SectionDescription SECTION_SCOPE = new SectionDescription(
CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_scope,
new String[][]{
-// {CDIPreferences., CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_}
+ {CDIPreferences.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleScopeTypeAnnotations_label},
+ {CDIPreferences.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingScopeWhenThereIsNoDefaultScope_label},
+ {CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneScope_label},
+ {CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label},
+ {CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label},
+ {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label},
+ {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label},
+ {CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label},
+ {CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label},
+ {CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label},
},
CDICorePlugin.PLUGIN_ID
);
@@ -74,7 +75,23 @@
private static SectionDescription SECTION_MEMBER = new SectionDescription(
CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_member,
new String[][]{
- {CDIPreferences.TEST, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_test_label}
+ {CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerAnnotatedInject_label},
+ {CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotated_label},
+ {CDIPreferences.OBSERVER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_observerAnnotatedInject_label},
+ {CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotated_label},
+ {CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSessionBean_label},
+ {CDIPreferences.MULTIPLE_DISPOSING_PARAMETERS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleDisposingParameters_label},
+ {CDIPreferences.DISPOSER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_disposerAnnotatedInject_label},
+ {CDIPreferences.ILLEGAL_DISPOSER_IN_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label},
+ {CDIPreferences.NO_PRODUCER_MATCHING_DISPOSER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label},
+ {CDIPreferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label},
+ {CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label},
+ {CDIPreferences.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label},
+ {CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label},
+ {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label},
+ {CDIPreferences.MULTIPLE_OBSERVING_PARAMETERS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label},
+ {CDIPreferences.ILLEGAL_OBSERVER_IN_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label},
+ {CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label},
},
CDICorePlugin.PLUGIN_ID
);
@@ -82,26 +99,56 @@
private static SectionDescription SECTION_INTERCEPTOR = new SectionDescription(
CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_interceptor_and_decorator,
new String[][]{
- {CDIPreferences.TEST, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_test_label}
+ {CDIPreferences.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label},
+ {CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedInterceptorOrDecorator_label},
+ {CDIPreferences.PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_label},
+ {CDIPreferences.DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_label},
+ {CDIPreferences.MULTIPLE_DELEGATE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleDelegate_label},
+ {CDIPreferences.MISSING_DELEGATE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingDelegate_label},
+ {CDIPreferences.ILLEGAL_INJECTION_POINT_DELEGATE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalInjectionPointDelegate_label},
+ {CDIPreferences.ILLEGAL_BEAN_DECLARING_DELEGATE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalBeanDeclaringDelegate_label},
+ {CDIPreferences.DELEGATE_HAS_ILLEGAL_TYPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_delegateHasIllegalType_label},
+ {CDIPreferences.ILLEGAL_LIFECYCLE_CALLBACK_INTERCEPTOR_BINDING, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalLifecycleCallbackInterceptorBinding_label},
+ {CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalInterceptorBindingMethod_label},
+ {CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_conflictingInterceptorBindings_label},
+ {CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label},
+ {CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label},
+ {CDIPreferences.MISSING_INTERCEPTOR_BINDING, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label},
},
CDICorePlugin.PLUGIN_ID
);
+ private static SectionDescription SECTION_SPECIALIZATION = new SectionDescription(
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_miscellaneous,
+ new String[][]{
+ {CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label},
+ {CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label},
+ {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label},
+ {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label},
+ {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label},
+ {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label},
+ {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label},
+ },
+ CDICorePlugin.PLUGIN_ID
+ );
+
private static SectionDescription SECTION_MISCELLANEOUS = new SectionDescription(
CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_miscellaneous,
new String[][]{
- {CDIPreferences.TEST, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_test_label}
+ {CDIPreferences.ILLEGAL_INJECTING_USERTRANSACTION_TYPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalInjectingUserTransactionType_label},
+ {CDIPreferences.ILLEGAL_INJECTING_INJECTIONPOINT_TYPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalInjectingInjectionPointType_label},
+ {CDIPreferences.ILLEGAL_QUALIFIER_IN_STEREOTYPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalQualifierInStereotype_label},
},
CDICorePlugin.PLUGIN_ID
);
private static SectionDescription[] ALL_SECTIONS = new SectionDescription[]{
- SECTION_TEST,
SECTION_NAME,
SECTION_TYPE,
SECTION_SCOPE,
SECTION_MEMBER,
SECTION_INTERCEPTOR,
+ SECTION_SPECIALIZATION,
SECTION_MISCELLANEOUS
};
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2010-01-11 08:51:21 UTC (rev 19688)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2010-01-11 09:22:32 UTC (rev 19689)
@@ -89,6 +89,7 @@
// Interceptor & Decorator
public static String CDIValidatorConfigurationBlock_section_interceptor_and_decorator;
public static String CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label;
+ public static String CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedInterceptorOrDecorator_label;
public static String CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_label;
public static String CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_label;
public static String CDIValidatorConfigurationBlock_pb_multipleDelegate_label;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-01-11 08:51:21 UTC (rev 19688)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-01-11 09:22:32 UTC (rev 19689)
@@ -77,7 +77,8 @@
##Interceptor & Decorator
CDIValidatorConfigurationBlock_section_interceptor_and_decorator=Interceptors & Decorators
-CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label=
+CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label=Both @Interceptor and @Decorator used:
+CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedInterceptorOrDecorator_label=Session bean annotated @Interceptor or @Decorator:
CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_label=
CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_label=
CDIValidatorConfigurationBlock_pb_multipleDelegate_label=
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19688 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-01-11 03:51:21 -0500 (Mon, 11 Jan 2010)
New Revision: 19688
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4613
Build console configuration for better completion proposals.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2010-01-11 07:48:17 UTC (rev 19687)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2010-01-11 08:51:21 UTC (rev 19688)
@@ -61,6 +61,7 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.console.QueryPage;
+import org.hibernate.console.execution.ExecutionContext;
import org.hibernate.console.execution.ExecutionContext.Command;
import org.hibernate.eclipse.console.AbstractQueryEditor;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
@@ -172,6 +173,18 @@
final ConsoleConfiguration consoleConfiguration = getConsoleConfiguration();
+ if(consoleConfiguration.getConfiguration()==null) {
+ consoleConfiguration.build();
+ consoleConfiguration.execute( new ExecutionContext.Command() {
+ public Object execute() {
+ if(consoleConfiguration.hasConfiguration()) {
+ consoleConfiguration.getConfiguration().buildMappings();
+ }
+ return consoleConfiguration;
+ }
+ });
+ }
+
Set<String> imports = new HashSet<String>();
Configuration configuration = consoleConfiguration.getConfiguration();
if(configuration!=null) {
15 years, 11 months
- 1
- 0