JBoss Tools SVN: r15841 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-10 05:30:20 -0400 (Wed, 10 Jun 2009)
New Revision: 15841
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java
Log:
JBIDE-4460: the org.eclipse.swt.swtexception:Invalid Thread access when choose a wsdl file in the import wsdl wizard
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java 2009-06-10 08:54:59 UTC (rev 15840)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java 2009-06-10 09:30:20 UTC (rev 15841)
@@ -652,14 +652,19 @@
@Override
protected IStatus run (IProgressMonitor monitor) {
monitor.beginTask(msg, 1);
-
- fInput = attemptLoad(fRunnableLoadURI);
- monitor.worked(1);
- if (fBrowseButton != null && fBrowseButton.isDisposed() == false ) {
+ // move this to asyncExec() as below because the method will
+ // modify UI element, if not, will have a invalid access error.
+
+ /* fInput = attemptLoad(fRunnableLoadURI); */
+
+ monitor.worked(1);
+ if (fBrowseButton != null
+ && fBrowseButton.isDisposed() == false) {
fBrowseButton.getDisplay().asyncExec(new Runnable() {
public void run() {
- loadDone();
- }
+ fInput = attemptLoad(fRunnableLoadURI);
+ loadDone();
+ }
});
}
15 years, 6 months
JBoss Tools SVN: r15840 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-10 04:54:59 -0400 (Wed, 10 Jun 2009)
New Revision: 15840
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java
Log:
JBIDE-4459: no refresh the properties view when change the import of the bpel process in the Source tab of the bpel editor
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2009-06-10 08:43:16 UTC (rev 15839)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2009-06-10 08:54:59 UTC (rev 15840)
@@ -10,10 +10,13 @@
*******************************************************************************/
package org.eclipse.bpel.ui.properties;
+import java.util.List;
+
import org.eclipse.bpel.common.ui.details.IDetailsAreaConstants;
import org.eclipse.bpel.common.ui.flatui.FlatFormAttachment;
import org.eclipse.bpel.common.ui.flatui.FlatFormData;
import org.eclipse.bpel.model.Import;
+import org.eclipse.bpel.model.Process;
import org.eclipse.bpel.ui.IBPELUIConstants;
import org.eclipse.bpel.ui.IHelpContextIds;
import org.eclipse.bpel.ui.Messages;
@@ -66,24 +69,42 @@
protected TableCursor tableCursor = null;
-
/**
- * Make this section use all the vertical space it can get.
+ * Make this section use all the vertical space it can get.
*
*/
@Override
- public boolean shouldUseExtraSpace() {
+ public boolean shouldUseExtraSpace() {
return true;
}
-
-
-
+
+ /**
+ * Override the super-class because the input is Process not Import
+ * If use super-class's directly, when change the import attributes
+ * the properties section do not change.
+ */
@Override
- protected MultiObjectAdapter[] createAdapters() {
+ protected void addAllAdapters() {
+ super.addAllAdapters();
+ if (fAdapters.length > 0) {
+ if (getModel() != null) {
+ EObject obj = getModel();
+ if (obj instanceof Process) {
+ List<Import> list = ((Process) obj).getImports();
+ for (int i = 0; i < list.size(); i++) {
+ fAdapters[0].addToObject((Import) list.get(i));
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ protected MultiObjectAdapter[] createAdapters() {
return new MultiObjectAdapter[] { new MultiObjectAdapter() {
@Override
public void notify(Notification n) {
- importViewer.setInput(getInput());
+ importViewer.setInput(getInput());
}
}, };
}
@@ -92,23 +113,24 @@
FlatFormData data;
- Button browseWSDL = fWidgetFactory.createButton(parent, Messages.ImportsSection_0,
- SWT.PUSH);
- Button browseXSD = fWidgetFactory.createButton(parent, Messages.ImportsSection_1,
- SWT.PUSH);
- final Button removeImport = fWidgetFactory.createButton(parent, Messages.ImportsSection_2, SWT.PUSH);
+ Button browseWSDL = fWidgetFactory.createButton(parent,
+ Messages.ImportsSection_0, SWT.PUSH);
+ Button browseXSD = fWidgetFactory.createButton(parent,
+ Messages.ImportsSection_1, SWT.PUSH);
+ final Button removeImport = fWidgetFactory.createButton(parent,
+ Messages.ImportsSection_2, SWT.PUSH);
removeImport.setEnabled(false);
-
- removeImport.addSelectionListener( new SelectionListener () {
- public void widgetDefaultSelected(SelectionEvent e) {
+ removeImport.addSelectionListener(new SelectionListener() {
+
+ public void widgetDefaultSelected(SelectionEvent e) {
}
public void widgetSelected(SelectionEvent e) {
- removeImport();
- }
+ removeImport();
+ }
});
-
+
browseWSDL.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
@@ -148,7 +170,8 @@
data.top = new FlatFormAttachment(0, IDetailsAreaConstants.VSPACE);
browseWSDL.setLayoutData(data);
- importLabel = fWidgetFactory.createLabel(parent, Messages.ImportDetails_Imports_20);
+ importLabel = fWidgetFactory.createLabel(parent,
+ Messages.ImportDetails_Imports_20);
data = new FlatFormData();
data.left = new FlatFormAttachment(0, IDetailsAreaConstants.HSPACE);
data.top = new FlatFormAttachment(browseWSDL,
@@ -156,8 +179,8 @@
importLabel.setLayoutData(data);
// create table
- importTable = fWidgetFactory.createTable(parent, SWT.FULL_SELECTION | SWT.V_SCROLL
- | SWT.READ_ONLY);
+ importTable = fWidgetFactory.createTable(parent, SWT.FULL_SELECTION
+ | SWT.V_SCROLL | SWT.READ_ONLY);
data = new FlatFormData();
data.left = new FlatFormAttachment(0, IDetailsAreaConstants.HSPACE);
@@ -171,7 +194,7 @@
// set up table
importTable.setLinesVisible(true);
importTable.setHeaderVisible(true);
-
+
tableProvider = new ColumnTableProvider();
tableProvider.add(new LocationColumn());
tableProvider.add(new NamespaceColumn());
@@ -185,13 +208,15 @@
importViewer.setColumnProperties(tableProvider.getColumnProperties());
importViewer.setCellEditors(tableProvider
.createCellEditors(importTable));
-
- importViewer.addPostSelectionChangedListener( new ISelectionChangedListener () {
- public void selectionChanged(SelectionChangedEvent event) {
- removeImport.setEnabled( ! event.getSelection().isEmpty() );
- }
- });
+ importViewer
+ .addPostSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ removeImport
+ .setEnabled(!event.getSelection().isEmpty());
+ }
+ });
+
tableCursor = BPELUtil.createTableCursor(importTable, importViewer);
}
@@ -205,7 +230,7 @@
@Override
public String getProperty() {
return "Namespace"; //$NON-NLS-1$
- }
+ }
@Override
public int getInitialWeight() {
@@ -263,18 +288,15 @@
return (s == null) ? "" : s; //$NON-NLS-1$
}
}
-
-
@Override
- protected void basicSetInput(EObject newInput) {
+ protected void basicSetInput(EObject newInput) {
super.basicSetInput(newInput);
-
+
if (getInput() != null) {
importViewer.setInput(getInput());
}
}
-
@Override
protected void createClient(Composite parent) {
@@ -299,30 +321,29 @@
}
}
- void removeImport () {
-
+ void removeImport() {
+
ISelection selection = importViewer.getSelection();
if (selection.isEmpty()) {
- return ;
+ return;
}
IStructuredSelection ssel = null;
- if ( (selection instanceof IStructuredSelection) == false) {
+ if ((selection instanceof IStructuredSelection) == false) {
return;
}
-
- ssel = (IStructuredSelection) selection;
+
+ ssel = (IStructuredSelection) selection;
Object obj = ssel.getFirstElement();
-
- RemoveImportCommand cmd = new RemoveImportCommand (
- ModelHelper.getProcess( getInput() ),
- obj,
+
+ RemoveImportCommand cmd = new RemoveImportCommand(ModelHelper
+ .getProcess(getInput()), obj,
IBPELUIConstants.CMD_REMOVE_IMPORT);
-
+
if (cmd.canDoExecute()) {
- getCommandFramework().execute( cmd );
+ getCommandFramework().execute(cmd);
}
}
-
+
void browseAndImportWSDL() {
SchemaImportDialog dialog = new SchemaImportDialog(importLabel
@@ -363,24 +384,19 @@
}
}
-
-
@Override
public void gotoMarker(IMarker marker) {
// TODO Auto-generated method stub
super.gotoMarker(marker);
}
-
+
/**
*
*/
-
@Override
public boolean isValidMarker(IMarker marker) {
return super.isValidMarker(marker);
}
-
-
}
15 years, 6 months
JBoss Tools SVN: r15839 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-10 04:43:16 -0400 (Wed, 10 Jun 2009)
New Revision: 15839
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java
Log:
JBIDE-4458: don't display the correct wizardpage of the import xsd wizard
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java 2009-06-10 08:25:04 UTC (rev 15838)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java 2009-06-10 08:43:16 UTC (rev 15839)
@@ -525,8 +525,14 @@
fWSILTreeViewer.setInput ( wsilDoc ) ;
if (wsilDoc == null || wsilDoc instanceof Throwable ) {
fBtnWSIL.setEnabled(false);
- // that's always available.
- KIND = BID_BROWSE_RESOURCE;
+
+
+ // delete KIND = BID_BROWSE_RESOURCE; by Grid.Qian
+ // because if not, the dialog always display the resource Control
+ // regardless last time if user choose the resource button
+
+ /*// that's always available.
+ KIND = BID_BROWSE_RESOURCE;*/
}
15 years, 6 months
JBoss Tools SVN: r15838 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-10 04:25:04 -0400 (Wed, 10 Jun 2009)
New Revision: 15838
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java
Log:
JBIDE-4457: can't save the change of a element location
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java 2009-06-10 06:37:47 UTC (rev 15837)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java 2009-06-10 08:25:04 UTC (rev 15838)
@@ -1162,7 +1162,7 @@
@Override
public boolean isDirty() {
- return fTextEditor.isDirty();
+ return fTextEditor.isDirty() || fDesignViewer.isDirty();
}
@Override
15 years, 6 months
JBoss Tools SVN: r15837 - in trunk/documentation/whatsnew: smooks and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-06-10 02:37:47 -0400 (Wed, 10 Jun 2009)
New Revision: 15837
Added:
trunk/documentation/whatsnew/images/smookstools_beanid_ref_contentassist.png
trunk/documentation/whatsnew/images/smookstools_bindings_context_contentassist.png
trunk/documentation/whatsnew/images/smookstools_contentassist_javabeanmethods.png
trunk/documentation/whatsnew/images/smookstools_contentassist_javabeanproperties.png
trunk/documentation/whatsnew/images/smookstools_contentassist_javatypesearching.png
trunk/documentation/whatsnew/images/smookstools_contentassist_selectorgeneration.png
trunk/documentation/whatsnew/images/smookstools_contentassist_tooltip.png
trunk/documentation/whatsnew/images/smookstools_selector_generate_dialog.png
trunk/documentation/whatsnew/images/smookstools_validationoneditor.png
trunk/documentation/whatsnew/images/smookstools_validationpreferencespage.png
Modified:
trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M1.html
Log:
Add the "whatnew" for smooks tools
Added: trunk/documentation/whatsnew/images/smookstools_beanid_ref_contentassist.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_beanid_ref_contentassist.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_bindings_context_contentassist.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_bindings_context_contentassist.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_contentassist_javabeanmethods.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_contentassist_javabeanmethods.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_contentassist_javabeanproperties.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_contentassist_javabeanproperties.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_contentassist_javatypesearching.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_contentassist_javatypesearching.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_contentassist_selectorgeneration.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_contentassist_selectorgeneration.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_contentassist_tooltip.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_contentassist_tooltip.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_selector_generate_dialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_selector_generate_dialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_validationoneditor.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_validationoneditor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/smookstools_validationpreferencespage.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/smookstools_validationpreferencespage.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M1.html 2009-06-10 06:35:48 UTC (rev 15836)
+++ trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M1.html 2009-06-10 06:37:47 UTC (rev 15837)
@@ -5,39 +5,109 @@
<head>
<meta http-equiv="Content-Language" content="en-us" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="../whatsnew.css"/>
+<link rel="stylesheet" href="../whatsnew.css" />
<title>Smooks tools 1.1.0.M1 What's New</title>
</head>
<body>
<h1>Smooks tools 1.1.0.M1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../core/core-news-3.1.0.M1.html">Core ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../core/core-news-3.1.0.M1.html">Core ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
- <tr>
- <td colspan="2">
- <hr/>
- <h3>Smooks</h3>
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Smooks Configuration File Editor</b></td>
- <td valign="top">
- <p>Based on feedback the "mapping style" editor for Smooks were dropped and replaced with a more configuration close Smooks editor.</p>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Smooks</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Smooks
+ Configuration File Editor</b></td>
+ <td valign="top">
+ <p>Based on feedback the "mapping style" editor for Smooks were
+ dropped and replaced with a more configuration close Smooks editor.</p>
-<p><img src="../images/smooksconfigstyleeditor.png"/></p>
+ <p><img src="../images/smooksconfigstyleeditor.png" /></p>
-<p>The new editor supports both Smooks 1.0 and 1.1 style config.</p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
+ <p>The new editor supports both Smooks 1.0 and 1.1 style config.</p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname4" id="itemname4"></a><b>Smooks
+ Configuration File Validation</b></td>
+ <td valign="top">
+ <p>Smooks Tools can validate Smooks configuration file to find out any problems of the file and show the problem images
+ on the editor.</p>
+
+ <p><img src="../images/smookstools_validationoneditor.png" /></p>
+
+ <p>Users can enable/disable the Smooks configuration file validator in preference page.</p>
+
+ <p><img src="../images/smookstools_validationpreferencespage.png" /></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname5" id="itemname5"></a><b>Smooks
+ Selector Generation</b></td>
+ <td valign="top">
+ <p>Smooks Tools allow users to add the "Input Data" to generation the Selector for configuration file.</p>
+ <p>On the below of the Smooks editor , there is a section GUI to add/delete "Input Data".
+ The "Input Data" support Java/XML type.</p>
+
+ <p><img src="../images/smookstools_selector_generate_dialog.png" /></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname6" id="itemname6"></a><b>Content assist in Smooks Editor</b></td>
+ <td valign="top">
+ <p>There are some Text control in Smooks editor provide content assist. When user active the control which supports
+ content assist , a small bulb will show on the left bottom. </p>
+
+ <p><img src="../images/smookstools_contentassist_tooltip.png" /></p>
+
+ <p>Content assist for Selector generation.</p>
+ <p><img src="../images/smookstools_contentassist_selectorgeneration.png" /></p>
+
+ <p>Content assist for Java type searching.</p>
+ <p><img src="../images/smookstools_contentassist_javatypesearching.png" /></p>
+
+ <p>Content assist for Properties/Setter Methods of Java bean model.</p>
+ <p><img src="../images/smookstools_contentassist_javabeanproperties.png" /></p>
+ <p><img src="../images/smookstools_contentassist_javabeanmethods.png" /></p>
+ <p>Content assist for Bindings.</p>
+ <p><img src="../images/smookstools_bindings_context_contentassist.png" /></p>
+
+ <p>Content assist for Binding ID reference.</p>
+ <p><img src="../images/smookstools_beanid_ref_contentassist.png" /></p>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
</table>
</body>
15 years, 6 months
JBoss Tools SVN: r15835 - trunk/bpel.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-10 01:41:32 -0400 (Wed, 10 Jun 2009)
New Revision: 15835
Added:
trunk/bpel/plugins/
Log:
add the plugins folder in the bpel module
15 years, 6 months
JBoss Tools SVN: r15834 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-09 23:10:13 -0400 (Tue, 09 Jun 2009)
New Revision: 15834
Added:
trunk/bpel/
Log:
add bpel module
15 years, 6 months
JBoss Tools SVN: r15833 - trunk/ws.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-09 23:09:21 -0400 (Tue, 09 Jun 2009)
New Revision: 15833
Removed:
trunk/ws/bpel/
Log:
wrong place
15 years, 6 months
JBoss Tools SVN: r15832 - trunk/ws.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-06-09 23:08:43 -0400 (Tue, 09 Jun 2009)
New Revision: 15832
Added:
trunk/ws/bpel/
Log:
add the bpel module
15 years, 6 months
JBoss Tools SVN: r15831 - in trunk: common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-06-09 18:08:48 -0400 (Tue, 09 Jun 2009)
New Revision: 15831
Added:
trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaUIPlugin.java
Modified:
trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableLoaderImpl.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-351 bad exception handling fix
Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF 2009-06-09 22:02:52 UTC (rev 15830)
+++ trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF 2009-06-09 22:08:48 UTC (rev 15831)
@@ -29,3 +29,4 @@
org.jboss.tools.common.meta.ui.form,
org.jboss.tools.common.meta.ui.attribute.editor,
org.jboss.tools.common.meta.ui.search
+Bundle-Activator: org.jboss.tools.common.meta.ui.MetaUIPlugin
Added: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaUIPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaUIPlugin.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaUIPlugin.java 2009-06-09 22:08:48 UTC (rev 15831)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.meta.ui;
+
+import org.jboss.tools.common.log.BaseUIPlugin;
+
+/**
+ * @author eskimo
+ *
+ */
+public class MetaUIPlugin extends BaseUIPlugin {
+
+ private static MetaUIPlugin plugin;
+ /**
+ *
+ */
+ public MetaUIPlugin() {
+ plugin = this;
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static MetaUIPlugin getDefault() {
+ return plugin;
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaUIPlugin.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java 2009-06-09 22:02:52 UTC (rev 15830)
+++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java 2009-06-09 22:08:48 UTC (rev 15831)
@@ -13,7 +13,10 @@
import java.text.MessageFormat;
import org.jboss.tools.common.meta.ui.Messages;
+import org.jboss.tools.common.meta.ui.MetaUIPlugin;
import org.jboss.tools.common.model.ui.navigator.NavigatorLabelProvider;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.viewers.*;
import org.eclipse.search.ui.*;
import org.eclipse.swt.layout.*;
@@ -46,12 +49,17 @@
search.removeListener(this);
search.addListener(this);
this.uiState = uiState;
- if(viewer != null) {
- try {
- viewer.refresh();
- } catch (Exception e) {
- //ignore
- }
+ if (viewer != null) {
+ SafeRunner.run(new ISafeRunnable() {
+
+ public void run() throws Exception {
+ viewer.refresh();
+ }
+
+ public void handleException(Throwable exception) {
+ MetaUIPlugin.getDefault().logError(exception);
+ }
+ });
}
}
@@ -147,7 +155,15 @@
Display.getDefault().asyncExec(new Runnable() {
public void run() {
if(viewer == null || newInput == null) return;
- try { viewer.refresh(); } catch (Exception e) {}
+ SafeRunner.run(new ISafeRunnable() {
+
+ public void run() throws Exception {
+ viewer.refresh();
+ }
+
+ public void handleException(Throwable exception) {
+ MetaUIPlugin.getDefault().logError(exception);
+ }});
}
});
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java 2009-06-09 22:02:52 UTC (rev 15830)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/SpecialWizardSupport.java 2009-06-09 22:08:48 UTC (rev 15831)
@@ -113,7 +113,7 @@
* May return preset or previosly entered data (name-value)
*/
public String[][] getInfo(int stepId) {
- return null;
+ return new String[0][0];
}
/*
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java 2009-06-09 22:02:52 UTC (rev 15830)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java 2009-06-09 22:08:48 UTC (rev 15831)
@@ -47,7 +47,7 @@
public void checkFileSystemRename(IResourceChangeEvent event) {
String[] r = processDelta(event.getDelta());
- if(r == null) return;
+ if(r.length == 0) return;
pathRenamed(r[0], r[1]);
}
@@ -64,7 +64,7 @@
}
}
}
- return null;
+ return new String[0];
}
private String[] extractRename(IResourceDelta delta) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableLoaderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableLoaderImpl.java 2009-06-09 22:02:52 UTC (rev 15830)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableLoaderImpl.java 2009-06-09 22:08:48 UTC (rev 15831)
@@ -72,14 +72,10 @@
if(sc == null) {
Properties p = new Properties();
if(hasName) p.setProperty("name", name);
- try {
- sc = (SharableElement)sharable.getModel().createModelObject(en, p);
- sc.setScopeExists(PROJECT, false);
- sharable.addChild(sc);
- if(!hasName) sharable.setName(name);
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError("SharableLoaderImpl:loadChild:" + e.getMessage());
- }
+ sc = (SharableElement)sharable.getModel().createModelObject(en, p);
+ sc.setScopeExists(PROJECT, false);
+ sharable.addChild(sc);
+ if(!hasName) sharable.setName(name);
}
if(sc != null) {
if(sc instanceof SharableContainerImpl)
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-06-09 22:02:52 UTC (rev 15830)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-06-09 22:08:48 UTC (rev 15831)
@@ -18,7 +18,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -219,7 +218,7 @@
refComponents = comp.getReferences();
for (IVirtualReference virtualReference : refComponents) {
IVirtualComponent component = virtualReference.getReferencedComponent();
- if(component!=null && !component.isBinary() && JavaEEProjectUtilities.isDynamicWebComponent(component)) {
+ if(component!=null && !component.isBinary() && J2EEProjectUtilities.isDynamicWebComponent(component)) {
ISeamProject seamProject = SeamCorePlugin.getSeamProject(component.getProject(), false);
if(seamProject!=null) {
return seamProject;
15 years, 6 months