Author: dgolovin Date: 2009-05-11 20:52:12 -0400 (Mon, 11 May 2009) New Revision: 15217 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/FormatJSPActionDelegate.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/JSPFormatter.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/TilesUIPlugin.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesElement.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesRecognizer.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/Items.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/LayuotConstants.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/Change.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackageUtil.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderMoveChange.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderRenameChange.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamJavaPackageRenameChange.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamProjectRenameChange.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ASTVisitorImpl.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/dialog/SeamFacetVersionChangeDialog.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/JDBCTablesColumnsReader.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/TablesColumnsCollector.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/Messages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java Log: fix PMD violations after local build is finally up on Eclipse 3.5M7 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPBundleHyperlinkPartitioner.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -215,9 +215,6 @@ } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return false; - } catch (Exception x) { - JSFExtensionsPlugin.log("", x); - return false; } finally { smw.dispose(); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -99,34 +99,30 @@ updateActiveContentAssistProcessor(document); ICompletionProposal[] proposals = super.computeCompletionProposals(viewer, documentPosition); // If proposal list from super is empty to try to get it from Red Hat dinamic jsp content assist processor. - try { - if(proposals.length == 0) { - String partitionType = getPartitionType((StructuredTextViewer) viewer, documentPosition); - IContentAssistProcessor p = (IContentAssistProcessor) fPartitionToProcessorMap.get(partitionType); - if (!(p instanceof CSSContentAssistProcessor)) { + if(proposals.length == 0) { + String partitionType = getPartitionType((StructuredTextViewer) viewer, documentPosition); + IContentAssistProcessor p = (IContentAssistProcessor) fPartitionToProcessorMap.get(partitionType); + if (!(p instanceof CSSContentAssistProcessor)) { - IndexedRegion treeNode = ContentAssistUtils.getNodeAt((StructuredTextViewer) viewer, documentPosition); - Node node = (Node) treeNode; - - while (node != null && node.getNodeType() == Node.TEXT_NODE && node.getParentNode() != null) - node = node.getParentNode(); - IDOMNode xmlnode = (IDOMNode) node; - if(xmlnode!=null) { - fTextViewer = viewer; - IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition); - ITextRegion completionRegion = getCompletionRegion(documentPosition, node); - if(completionRegion!=null) { - String matchString = getMatchString(sdRegion, completionRegion, documentPosition); - ContentAssistRequest contentAssistRequest = computeCompletionProposals(documentPosition, matchString, completionRegion, (IDOMNode) treeNode, xmlnode); - if(contentAssistRequest!=null) { - proposals = contentAssistRequest.getCompletionProposals(); - } + IndexedRegion treeNode = ContentAssistUtils.getNodeAt((StructuredTextViewer) viewer, documentPosition); + Node node = (Node) treeNode; + + while (node != null && node.getNodeType() == Node.TEXT_NODE && node.getParentNode() != null) + node = node.getParentNode(); + IDOMNode xmlnode = (IDOMNode) node; + if(xmlnode!=null) { + fTextViewer = viewer; + IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition); + ITextRegion completionRegion = getCompletionRegion(documentPosition, node); + if(completionRegion!=null) { + String matchString = getMatchString(sdRegion, completionRegion, documentPosition); + ContentAssistRequest contentAssistRequest = computeCompletionProposals(documentPosition, matchString, completionRegion, (IDOMNode) treeNode, xmlnode); + if(contentAssistRequest!=null) { + proposals = contentAssistRequest.getCompletionProposals(); } } } } - } catch (Exception e) { - JspEditorPlugin.getPluginLog().logError(e); } proposals = getUniqProposals(proposals); return proposals; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -1115,9 +1115,18 @@ Boolean b = (Boolean) m.invoke(getSelectionProvider(), new Object[0]); return b.booleanValue(); - } catch (Exception e) { + } catch (NoSuchMethodException e) { firingSelectionFailedCount++; JspEditorPlugin.getPluginLog().logError(e); + } catch (IllegalArgumentException e) { + firingSelectionFailedCount++; + JspEditorPlugin.getPluginLog().logError(e); + } catch (IllegalAccessException e) { + firingSelectionFailedCount++; + JspEditorPlugin.getPluginLog().logError(e); + } catch (InvocationTargetException e) { + firingSelectionFailedCount++; + JspEditorPlugin.getPluginLog().logError(e); } return false; } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -66,8 +66,12 @@ Class cls = b.loadClass("org.jboss.tools.vpe.editor.dnd.context.ViewerDropAdapterFactory"); dropAdapterFactory = (IViewerDropAdapterFactory)cls.newInstance(); } - } catch (Exception e) { + } catch (IllegalAccessException e) { JspEditorPlugin.getPluginLog().logError(e); + } catch (ClassNotFoundException e) { + JspEditorPlugin.getPluginLog().logError(e); + } catch (InstantiationException e) { + JspEditorPlugin.getPluginLog().logError(e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -19,22 +19,26 @@ import java.util.Set; import java.util.Stack; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySheetEntry; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.IPropertySource2; import org.eclipse.ui.views.properties.TextPropertyDescriptor; -import org.eclipse.wst.sse.core.internal.provisional.*; +import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; +import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.sse.ui.views.properties.IPropertySourceExtension; -import org.eclipse.wst.xml.core.internal.contentmodel.*; +import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; +import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; +import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; +import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.eclipse.wst.xml.ui.internal.XMLUIMessages; import org.eclipse.wst.xml.ui.internal.properties.EnumeratedStringPropertyDescriptor; +import org.jboss.tools.common.kb.AttributeDescriptor; +import org.jboss.tools.common.kb.TagDescriptor; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor; import org.jboss.tools.jst.jsp.editor.IVisualController; @@ -45,10 +49,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.jboss.tools.common.kb.AttributeDescriptor; -import org.jboss.tools.common.kb.TagDescriptor; -import org.jboss.tools.common.model.plugin.ModelPlugin; - /** * @author Kabanovich * XMLPropertySourceAdapter extension that overrides @@ -547,12 +547,8 @@ } else { if (attr instanceof IDOMNode) { ((IDOMNode) attr).setValueSource(valueString); - try { - IVisualController controller = valueHelper.getController(); - if(controller != null) controller.visualRefresh(); - } catch (Exception e) { - JspEditorPlugin.getPluginLog().logError(e); - } + IVisualController controller = valueHelper.getController(); + if(controller != null) controller.visualRefresh(); } else { attr.setValue(valueString); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -256,8 +256,6 @@ } /// wtpTextJspKbConnector.setTaglibManagerProvider(parentEditor); } - } catch(Exception x) { - JspEditorPlugin.getPluginLog().logError("Error in activating prompting suppport", x); } finally { if(model != null) { model.releaseFromRead(); @@ -277,7 +275,7 @@ try { pageConnector = (WtpKbConnector)KbConnectorFactory.getIntstance().createConnector(KbConnectorType.JSP_WTP_KB_CONNECTOR, document); registerTaglibs(pageConnector, document); - } catch (Exception e) { + } catch (KbException e) { JspEditorPlugin.getPluginLog().logError(e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/FormatJSPActionDelegate.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/FormatJSPActionDelegate.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/FormatJSPActionDelegate.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -15,6 +15,7 @@ import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; import org.eclipse.jface.action.IAction; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; @@ -41,7 +42,7 @@ IDocument document = te.getTextViewer().getDocument(); try { new JSPFormatter().format(document, textSelection); - } catch (Exception e) { + } catch (BadLocationException e) { JspEditorPlugin.getPluginLog().logError(e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/JSPFormatter.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/JSPFormatter.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ui/action/JSPFormatter.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -31,7 +31,7 @@ int start = -1; int end = -1; - public void format(IDocument document, TextSelection textSelection) throws Exception { + public void format(IDocument document, TextSelection textSelection) throws BadLocationException { selectionStart = textSelection.getOffset(); selectionEnd = selectionStart + textSelection.getLength(); text = document.get(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/AdoptWebProjectContext.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -111,15 +111,11 @@ String entity = support.getTarget().getModel().getEntityRecognizer().getEntityName("xml", body); if(entity == null || !entity.startsWith("FileWebApp")) throw new XModelException("File " + location + "is not recognized as web descriptor file."); XModelObject webxml = null; - try { - webxml = support.getTarget().getModel().createModelObject(entity, null); - webxml.setAttributeValue("name", "web"); - XModelObjectLoaderUtil.setTempBody(webxml, body); - XModelObjectLoaderUtil.getObjectLoader(webxml).load(webxml); - webxml.getChildren(); - } catch (Exception e) { - throw new XModelException("Cannot load web descriptor file " + location + "."); - } + webxml = support.getTarget().getModel().createModelObject(entity, null); + webxml.setAttributeValue("name", "web"); + XModelObjectLoaderUtil.setTempBody(webxml, body); + XModelObjectLoaderUtil.getObjectLoader(webxml).load(webxml); + webxml.getChildren(); if("yes".equals(webxml.getAttributeValue("isIncorrect"))) throw new XModelException("Web descriptor file " + location + "is corrupted."); webxmlLocation = location; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/Items.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/Items.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/Items.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,9 +10,10 @@ ******************************************************************************/ package org.jboss.tools.jst.web.model.helpers.autolayout; -import java.util.*; -import org.jboss.tools.common.model.*; -import org.jboss.tools.jst.web.WebModelPlugin; +import java.util.HashMap; +import java.util.Map; + +import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.jst.web.model.helpers.WebProcessStructureHelper; import org.jboss.tools.jst.web.model.process.WebProcessConstants; @@ -41,11 +42,7 @@ public void setProcess(XModelObject process) { this.process = process; - try { - load(); - } catch (Exception e) { - WebModelPlugin.getPluginLog().logError(e); - } + load(); } private void load() { Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/LayuotConstants.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/LayuotConstants.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/LayuotConstants.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -29,47 +29,39 @@ public int indentY = 16; public void update() { - try { - XModel model = PreferenceModelUtilities.getPreferenceModel(); - XModelObject o = model.getByPath("%Options%/Struts Studio/Editors/Web Flow Diagram"); - String g = o.getAttributeValue("Grid Step"); - int step = Integer.parseInt(g); - indentX = (step < 24) ? 24 : step; - indentY = (step < 16) ? 16 : step; - if(step == 16) { - deltaX = 208; - deltaY = 112; - incX = 16; - incY = 32; - indentX = 32; - } else if(step == 24) { - deltaX = 240; - deltaY = 120; - incX = 24; - incY = 24; - } else if(step == 32) { - deltaX = 256; - deltaY = 128; - incX = 32; - incY = 32; - } else if(step == 40) { - deltaX = 240; - deltaY = 120; - incX = 40; - incY = 40; - } else { - deltaX = DELTA_X; - deltaY = DELTA_Y; - incX = X_INC; - incY = Y_INC; - } - } catch (Exception e) { - WebModelPlugin.getPluginLog().logError(e); + XModel model = PreferenceModelUtilities.getPreferenceModel(); + XModelObject o = model.getByPath("%Options%/Struts Studio/Editors/Web Flow Diagram"); + String g = o.getAttributeValue("Grid Step"); + int step = Integer.parseInt(g); + indentX = (step < 24) ? 24 : step; + indentY = (step < 16) ? 16 : step; + if(step == 16) { + deltaX = 208; + deltaY = 112; + incX = 16; + incY = 32; + indentX = 32; + } else if(step == 24) { + deltaX = 240; + deltaY = 120; + incX = 24; + incY = 24; + } else if(step == 32) { + deltaX = 256; + deltaY = 128; + incX = 32; + incY = 32; + } else if(step == 40) { + deltaX = 240; + deltaY = 120; + incX = 40; + incY = 40; + } else { deltaX = DELTA_X; deltaY = DELTA_Y; incX = X_INC; incY = Y_INC; - } + } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -19,6 +19,7 @@ import org.eclipse.wst.server.core.*; import org.eclipse.wst.server.core.internal.ServerType; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.plugin.ModelPlugin; @@ -92,22 +93,17 @@ IModule[] add = new IModule[]{m}; IModule[] remove = new IModule[0]; try { - try { - server.getRootModules(m, null); - } catch (CoreException ce) { - WebModelPlugin.getPluginLog().logError(ce); - return ce.getStatus().getMessage(); - } - - IProgressMonitor monitor = new NullProgressMonitor(); - IServerWorkingCopy copy = server.createWorkingCopy(); - IStatus status = copy.canModifyModules(add, remove, monitor); - if(status != null && !status.isOK()) return status.getMessage(); - return null; - } catch (Exception e) { - WebModelPlugin.getPluginLog().logError(e); - return WebUIMessages.CANNOT_REGISTER_IN_THIS_SERVER; + server.getRootModules(m, null); + } catch (CoreException ce) { + WebModelPlugin.getPluginLog().logError(ce); + return ce.getStatus().getMessage(); } + + IProgressMonitor monitor = new NullProgressMonitor(); + IServerWorkingCopy copy = server.createWorkingCopy(); + IStatus status = copy.canModifyModules(add, remove, monitor); + if(status != null && !status.isOK()) return status.getMessage(); + return null; } public static void register(IProject project) { @@ -131,7 +127,7 @@ if(canPublish(server)) { server.publish(IServer.PUBLISH_INCREMENTAL, monitor); } - } catch (Exception e) { + } catch (CoreException e) { WebModelPlugin.getPluginLog().logError(e); } } @@ -167,7 +163,7 @@ if(canPublish(server)) { server.publish(IServer.PUBLISH_INCREMENTAL, monitor); } - } catch (Exception e) { + } catch (CoreException e) { WebModelPlugin.getPluginLog().logError(e); } return true; @@ -238,7 +234,7 @@ } else { ModelPlugin.getWorkspace().run(new WR(), monitor); } - } catch (Exception e) { + } catch (CoreException e) { WebModelPlugin.getPluginLog().logError(e); } return Status.OK_STATUS; @@ -248,7 +244,7 @@ public void run(IProgressMonitor monitor) throws CoreException { try { register(p, servers, contextRoot, monitor); - } catch (Exception e) { + } catch (XModelException e) { WebModelPlugin.getPluginLog().logError(e); } } @@ -256,7 +252,7 @@ } } - private static void register(IProject p, IServer[] servers, String contextRoot, IProgressMonitor monitor) throws Exception { + private static void register(IProject p, IServer[] servers, String contextRoot, IProgressMonitor monitor) throws XModelException { if(monitor != null) monitor.beginTask("", 100); if(monitor != null) monitor.worked(5); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.jst.web.tiles.model; +import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.meta.XModelEntity; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.FileAuxiliary; import org.jboss.tools.common.model.filesystems.impl.AbstractXMLFileImpl; @@ -121,7 +123,7 @@ XModelObjectLoaderUtil.setTempBody(process, sw.toString()); aux.write(object.getParent(), object, process); return true; - } catch (Exception exc) { + } catch (IOException exc) { ModelPlugin.getPluginLog().logError(exc); return false; } @@ -133,17 +135,19 @@ if(systemId == null || systemId.length() == 0) systemId = DOC_EXTDTD; String publicId = DOC_PUBLICID; Element element = XMLUtil.createDocumentElement(object.getModelEntity().getXMLSubPath(), DOC_QUALIFIEDNAME, publicId, systemId, null); - + String result = null; try { util.setup(null, false); String att = object.getAttributeValue("comment"); if (att.length() > 0) util.saveAttribute(element, "#comment", att); util.saveChildren(element, object); - return SimpleWebFileLoader.serialize(element, object); - } catch (Exception e) { + result = SimpleWebFileLoader.serialize(element, object); + } catch (IOException e) { ModelPlugin.getPluginLog().logError(e); - return null; + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); } + return result; } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesRecognizer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesRecognizer.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesRecognizer.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,8 +10,9 @@ ******************************************************************************/ package org.jboss.tools.jst.web.tiles.model; -import org.jboss.tools.common.log.LogHelper; -import org.jboss.tools.common.model.loaders.*; +import java.io.IOException; + +import org.jboss.tools.common.model.loaders.EntityRecognizer; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.xml.XMLEntityResolver; @@ -19,7 +20,7 @@ static { try { XMLEntityResolver.registerPublicEntity(TilesConstants.DOC_PUBLICID, FileTilesRecognizer.class, "/meta/tiles_config_1_1.dtd"); - } catch (Exception e) { + } catch (IOException e) { ModelPlugin.getPluginLog().logError(e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/TilesUIPlugin.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/TilesUIPlugin.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/TilesUIPlugin.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -34,12 +34,7 @@ } public Shell getShell() { - try { - return TilesUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); - } catch(Exception e){ - getPluginLog().logError("Exception:", e); - return null; - } + return TilesUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); } public static TilesUIPlugin getDefault() { Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -13,6 +13,7 @@ import org.eclipse.gef.ui.actions.ActionRegistry; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.jboss.tools.common.editor.AbstractSelectionProvider; @@ -69,7 +70,7 @@ guiEditor.addErrorSelectionListener(createErrorSelectionListener()); selectionProvider.addHost( "guiEditor", guiEditor.getSelectionProvider()); //$NON-NLS-1$ - } catch (Exception e) { + } catch (PartInitException e) { TilesUIPlugin.getPluginLog().logError(e); } } @@ -81,11 +82,7 @@ public void dispose() { if(input != null) { selectionProvider.setHost(null); - try { - getSite().setSelectionProvider(null); - } catch (Exception e) { - TilesUIPlugin.getPluginLog().logError(e); - } + getSite().setSelectionProvider(null); } super.dispose(); if(guiEditor != null) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesGuiEditor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,20 +10,19 @@ ******************************************************************************/ package org.jboss.tools.jst.web.tiles.ui.editor; -import org.jboss.tools.common.editor.AbstractSectionEditor; import org.eclipse.gef.ui.actions.ActionRegistry; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.layout.GridData; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IFileEditorInput; - -import org.jboss.tools.common.log.LogHelper; +import org.eclipse.ui.PartInitException; +import org.jboss.tools.common.editor.AbstractSectionEditor; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin; import org.jboss.tools.jst.web.tiles.ui.editor.model.impl.TilesModel; +import org.xml.sax.SAXException; public class TilesGuiEditor extends AbstractSectionEditor { private TilesEditor gui = null; @@ -77,8 +76,10 @@ wrapper.update(); wrapper.layout(); - } catch (Exception ex) { + } catch (SAXException ex) { TilesUIPlugin.getPluginLog().logError(ex); + } catch (PartInitException ex) { + TilesUIPlugin.getPluginLog().logError(ex); } } @@ -96,11 +97,7 @@ if(gui != null) { gui.dispose(); gui = null; - try { - control.dispose(); - } catch (Exception e) { - TilesUIPlugin.getPluginLog().logError(e); - } + control.dispose(); control = null; } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesElement.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesElement.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesElement.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -106,14 +106,8 @@ public void updateModelModifiedProperty(Object oldValue, Object newValue) { if (getTilesModel() != null) { - try { - if (!oldValue.equals(newValue)) - ; + if (!oldValue.equals(newValue)) { getTilesModel().setModified(true); - } catch (Exception exception) { - TilesUIPlugin.getPluginLog().logError(exception); - if (newValue != null) - getTilesModel().setModified(true); } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,18 +10,24 @@ ******************************************************************************/ package org.jboss.tools.jst.web.tiles.ui.editor.model.impl; -import java.util.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.List; +import java.util.Vector; -import org.xml.sax.*; - -import java.beans.*; - import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Control; - -import org.jboss.tools.common.model.*; -import org.jboss.tools.common.model.event.*; +import org.eclipse.swt.widgets.Menu; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.event.XModelTreeEvent; +import org.jboss.tools.common.model.event.XModelTreeListener; +import org.jboss.tools.common.model.ui.action.XModelObjectActionList; +import org.jboss.tools.common.model.ui.util.ModelUtilities; +import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync; import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; import org.jboss.tools.jst.web.tiles.TilesPreference; import org.jboss.tools.jst.web.tiles.model.helpers.TilesStructureHelper; @@ -34,12 +40,8 @@ import org.jboss.tools.jst.web.tiles.ui.editor.model.ITilesModelListener; import org.jboss.tools.jst.web.tiles.ui.editor.model.ITilesOptions; import org.jboss.tools.jst.web.tiles.ui.preferences.TilesEditorTabbedPreferencesPage; +import org.xml.sax.SAXException; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.ui.action.*; -import org.jboss.tools.common.model.ui.util.ModelUtilities; -import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync; - public class TilesModel extends TilesElement implements ITilesModel, PropertyChangeListener, XModelTreeListener { List<IDefinition> visibleDefinitions = new Vector<IDefinition>(); static final int DEFAULT_VERTICAL_SPACING = 20; @@ -73,7 +75,7 @@ public TilesModel() { try { setName(WebUIMessages.STRUTS_MODEL); - } catch (Exception ex) { + } catch (PropertyVetoException ex) { TilesUIPlugin.getPluginLog().logError(ex); } } @@ -102,7 +104,7 @@ return options; } - public TilesModel(Object data) throws SAXException, Exception { + public TilesModel(Object data) throws SAXException { this(); setData(data); map.setData((XModelObject) data); @@ -181,7 +183,7 @@ XModelTreeListenerSWTSync listener = null; - public void setData(Object data) throws Exception { + public void setData(Object data) { source = helper.getProcess((XModelObject) data); if (source == null) { return; @@ -300,7 +302,6 @@ } public void nodeChanged(XModelTreeEvent event) { - try { if (map == null) return; fireProcessChanged(); @@ -316,33 +317,26 @@ return; } element.nodeChanged(event); - } catch (Exception x) { - TilesUIPlugin.getPluginLog().logError("Error in processing model event", x); - } } public void structureChanged(XModelTreeEvent event) { TilesElement element; - try { - Object obj = event.getModelObject().getPath(); - if (obj == null) - return; - if (map == null) - return; - element = (TilesElement) map.get(obj); - if (element == null) { - return; - } - if (event.kind() == XModelTreeEvent.STRUCTURE_CHANGED) { - element.structureChanged(event); - } else if (event.kind() == XModelTreeEvent.CHILD_ADDED) { - element.nodeAdded(event); - } else if (event.kind() == XModelTreeEvent.CHILD_REMOVED) { - element.nodeRemoved(event); - } - } catch (Exception x) { - TilesUIPlugin.getPluginLog().logError("Error in processing model event", x); + Object obj = event.getModelObject().getPath(); + if (obj == null) + return; + if (map == null) + return; + element = (TilesElement) map.get(obj); + if (element == null) { + return; } + if (event.kind() == XModelTreeEvent.STRUCTURE_CHANGED) { + element.structureChanged(event); + } else if (event.kind() == XModelTreeEvent.CHILD_ADDED) { + element.nodeAdded(event); + } else if (event.kind() == XModelTreeEvent.CHILD_REMOVED) { + element.nodeRemoved(event); + } } public void putToMap(Object key, Object value) { @@ -560,7 +554,7 @@ if (str.indexOf("default") >= 0)return DEFAULT_VERTICAL_SPACING; //$NON-NLS-1$ try { return Integer.parseInt(str); - } catch (Exception ex) { + } catch (NumberFormatException ex) { TilesUIPlugin.getPluginLog().logError(ex); return DEFAULT_VERTICAL_SPACING; } @@ -573,7 +567,7 @@ if (str.indexOf("default") >= 0)return DEFAULT_HORIZONTAL_SPACING; //$NON-NLS-1$ try { return Integer.parseInt(str); - } catch (Exception ex) { + } catch (NumberFormatException ex) { TilesUIPlugin.getPluginLog().logError(ex); return DEFAULT_HORIZONTAL_SPACING; } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -131,18 +131,14 @@ protected XFilteredTree getFilteredTree(Object object) { XFilteredTree result = null; if (result == null && object instanceof XModelObject) { - try { - XModel model = ((XModelObject)object).getModel(); - String n = getFilteredTreeName(model); - result = FilteredTreesCache.getInstance().getFilteredTree(n, model); - if(result == null) return null; - if(result.getRoot() == null) { - result = null; - } else { - FilteredTreesCache.getInstance().addListener(syncListener, model); - } - } catch(Exception ex) { - WebUiPlugin.getPluginLog().logError(ex); + XModel model = ((XModelObject)object).getModel(); + String n = getFilteredTreeName(model); + result = FilteredTreesCache.getInstance().getFilteredTree(n, model); + if(result == null) return null; + if(result.getRoot() == null) { + result = null; + } else { + FilteredTreesCache.getInstance().addListener(syncListener, model); } } return result; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/CustomCheckboxTreeAndListGroup.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -38,24 +38,26 @@ } public void initialCheckListItem(File listElement) { - setCurrentTreeSelection(listElement.getParentFile()); - try { - super.listItemChecked(listElement, true, true); - } catch (Exception e) { - WebUiPlugin.getPluginLog().logError(e); - } + super.listItemChecked(listElement, true, true); setCurrentTreeSelection(null); } public CheckboxTreeViewer getTreeViewer() { + CheckboxTreeViewer viewer = null; try { Field f = cls.getDeclaredField("treeViewer"); f.setAccessible(true); - return (CheckboxTreeViewer)f.get(this); - } catch (Exception e) { - WebUiPlugin.getPluginLog().logError(e); - return null; - } + viewer = (CheckboxTreeViewer)f.get(this); + } catch (SecurityException e) { + WebUiPlugin.getPluginLog().logError(e); + } catch (NoSuchFieldException e) { + WebUiPlugin.getPluginLog().logError(e); + } catch (IllegalArgumentException e) { + WebUiPlugin.getPluginLog().logError(e); + } catch (IllegalAccessException e) { + WebUiPlugin.getPluginLog().logError(e); + } + return viewer; } public void setExpansions() { @@ -68,13 +70,19 @@ } private void setCurrentTreeSelection(Object element) { - try { - Field f = cls.getDeclaredField("currentTreeSelection"); + Field f; + try { + f = cls.getDeclaredField("currentTreeSelection"); f.setAccessible(true); f.set(this, element); - } catch (Exception e) { - WebUiPlugin.getPluginLog().logError(e); - } + } catch (SecurityException e) { + WebUiPlugin.getPluginLog().logError(e); + } catch (NoSuchFieldException e) { + WebUiPlugin.getPluginLog().logError(e); + } catch (IllegalArgumentException e) { + WebUiPlugin.getPluginLog().logError(e); + } catch (IllegalAccessException e) { + WebUiPlugin.getPluginLog().logError(e); + } } - } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.web.ui.wizards.project; +import java.lang.reflect.InvocationTargetException; import java.util.Properties; import org.eclipse.core.runtime.CoreException; @@ -82,7 +83,7 @@ public boolean performFinish() { if(!checkOldVersion()) return false; - boolean result = true; + boolean result = false; try { if(!checkServletVersion()) return false; context.commitSupportDelta(); @@ -90,9 +91,15 @@ getContainer().run(false, true, op); updatePerspective(); BasicNewResourceWizard.selectAndReveal(context.getProjectHandle(), ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow()); - } catch (Exception ex) { + result = true; + } catch (XModelException ex) { WebUiPlugin.getPluginLog().logError(ex); - result = false; + } catch (CoreException ex) { + WebUiPlugin.getPluginLog().logError(ex); + } catch (InvocationTargetException ex) { + WebUiPlugin.getPluginLog().logError(ex); + } catch (InterruptedException ex) { + WebUiPlugin.getPluginLog().logError(ex); } return result; } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -349,14 +349,7 @@ setErrorMessage(nameStatus.getMessage()); return false; } - IProject project = null; - try { - project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - } catch (Exception e) { - WebUiPlugin.getPluginLog().logError(e); - setErrorMessage(e.getMessage()); - return false; - } + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); if(project != null && project.exists() && !project.isOpen()) { setErrorMessage(NLS.bind(WebUIMessages.PROJECT_EXISTS_IN_WORKSPACE, getProjectNameValue()) ); @@ -399,13 +392,9 @@ } private void updateContext(boolean onProjectNameEdit, boolean onProjectLocationEdit) { - try { if (getWebXmlFile() != null) updateProjectNameValue(onProjectNameEdit, onProjectLocationEdit); context.setProjectName(getProjectNameValue()); context.setWebXmlLocation(getWebXmlLocationValue()); - } catch (Exception ex) { - WebUiPlugin.getPluginLog().logError(ex); - } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.jst.web.ui.wizards.project; +import java.lang.reflect.InvocationTargetException; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IContributor; @@ -61,7 +63,6 @@ public boolean performFinish() { boolean result = true; - try { mainPage.commit(); context.setServletVersion("2.4"); @@ -70,19 +71,21 @@ } IRunnableWithProgress op = new WorkspaceModifyDelegatingOperation(createOperation()); - getContainer().run(false, true, op); + try { + getContainer().run(false, true, op); + } catch (InvocationTargetException e) { + WebUiPlugin.getPluginLog().logError(e); + } catch (InterruptedException e) { + WebUiPlugin.getPluginLog().logError(e); + } updatePerspective(); BasicNewResourceWizard.selectAndReveal(context.getProjectHandle(), ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow()); - } catch (Exception ex) { - WebUiPlugin.getPluginLog().logError(ex); - result = false; - } return result; } protected abstract IRunnableWithProgress createOperation(); - protected void updatePerspective() throws CoreException { + protected void updatePerspective() { BasicNewProjectResourceWizard.updatePerspective(new ConfigurationElementInternal()); } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/Change.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/Change.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/Change.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -83,7 +83,7 @@ * @return */ public boolean isChildrenAffected() { - return children != null && children.size() > 0; + return children != null && !children.isEmpty(); } /** Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -246,7 +246,7 @@ } public ISeamJavaComponentDeclaration getJavaDeclaration() { - if(javaDeclarations.size() == 0) return null; + if(javaDeclarations.isEmpty()) return null; return javaDeclarations.iterator().next(); } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -518,7 +518,7 @@ element.setAttribute(ATTR_CLASS_NAME, className); } - if(bijectedAttributes.size() > 0) { + if(!bijectedAttributes.isEmpty()) { Element b = XMLUtilities.createElement(element, "bijected"); for (IBijectedAttribute a: bijectedAttributes) { SeamObject o = (SeamObject)a; @@ -526,7 +526,7 @@ } } - if(componentMethods.size() > 0) { + if(!componentMethods.isEmpty()) { Element b = XMLUtilities.createElement(element, "methods"); for (ISeamComponentMethod a: componentMethods) { SeamObject o = (SeamObject)a; @@ -534,7 +534,7 @@ } } - if(roles.size() > 0) { + if(!roles.isEmpty()) { Element b = XMLUtilities.createElement(element, "roles"); for (IRole a: roles) { SeamObject o = (SeamObject)a; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessagesLoader.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -120,7 +120,7 @@ } } } - if(ds.size() == 0) { + if(ds.isEmpty()) { names.add("messages"); } return getResources(names, srcs); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackageUtil.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackageUtil.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackageUtil.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -111,7 +111,7 @@ public static void collectAllPackages(Map<String, ISeamPackage> packages, Collection<ISeamPackage> list) { for (ISeamPackage p : packages.values()) { - if(p.getComponents().size() > 0) list.add(p); + if(!p.getComponents().isEmpty()) list.add(p); collectAllPackages(p.getPackages(), list); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -526,7 +526,7 @@ Element pathElement = XMLUtilities.createElement(sourcePathsElement, "path"); //$NON-NLS-1$ pathElement.setAttribute("value", path.toString()); //$NON-NLS-1$ List<ISeamComponentDeclaration> cs = ds.getComponents(); - if(cs != null && cs.size() > 0) { + if(cs != null && !cs.isEmpty()) { Element cse = XMLUtilities.createElement(pathElement, "components"); //$NON-NLS-1$ for (ISeamComponentDeclaration d: cs) { SeamObject o = (SeamObject)d; @@ -534,7 +534,7 @@ } } List<ISeamFactory> fs = ds.getFactories(); - if(fs != null && fs.size() > 0) { + if(fs != null && !fs.isEmpty()) { Element cse = XMLUtilities.createElement(pathElement, "factories"); //$NON-NLS-1$ for (ISeamFactory d: fs) { SeamObject o = (SeamObject)d; @@ -542,7 +542,7 @@ } } List<String> imports = ds.getImports(); - if(imports != null && imports.size() > 0) { + if(imports != null && !imports.isEmpty()) { Element cse = XMLUtilities.createElement(pathElement, "imports"); //$NON-NLS-1$ for (String d: imports) { Element e = XMLUtilities.createElement(cse, SeamXMLConstants.TAG_IMPORT); //$NON-NLS-1$ @@ -777,7 +777,7 @@ ISeamComponentDeclaration[] components = ds.getComponents().toArray(new ISeamComponentDeclaration[0]); ISeamFactory[] factories = ds.getFactories().toArray(new ISeamFactory[0]); - if(ns.length == 0 && components.length == 0 && factories.length == 0 && ds.getImports().size() == 0) { + if(ns.length == 0 && components.length == 0 && factories.length == 0 && ds.getImports().isEmpty()) { pathRemoved(source); if(EclipseResourceUtil.isJar(source.toString())) { if(!sourcePaths.contains(source)) sourcePaths.add(source); @@ -792,7 +792,7 @@ namespaces.addPath(source, ns); } - if(ds.getImports().size() > 0) { + if(!ds.getImports().isEmpty()) { setImports(source.toString(), ds.getImports()); } else { removeImports(source.toString()); @@ -828,7 +828,7 @@ if(isClassNameChanged(currentClassName, loadedClassName)) { this.components.onClassNameChanged(currentClassName, loadedClassName, current); } - if(changes != null && changes.size() > 0) { + if(changes != null && !changes.isEmpty()) { Change cc = new Change(c, null, null, null); cc.addChildren(changes); List<Change> cchanges = Change.addChange(null, cc); @@ -947,7 +947,7 @@ * @throws CloneNotSupportedException */ public void registerComponentsInDependentProjects(LoadedDeclarations ds, IPath source) throws CloneNotSupportedException { - if(usedBy.size() == 0) return; + if(usedBy.isEmpty()) return; if(EclipseResourceUtil.isJar(source.toString())) return; for (SeamProject p : usedBy) { @@ -1062,7 +1062,7 @@ } public void firePathRemovedToDependentProjects(IPath source) { - if(usedBy.size() == 0) return; + if(usedBy.isEmpty()) return; if(EclipseResourceUtil.isJar(source.toString())) return; for (SeamProject p : usedBy) { @@ -1134,7 +1134,7 @@ * */ private boolean isComponentEmpty(SeamComponent c) { - if(c.getAllDeclarations().size() == 0) return true; + if(c.getAllDeclarations().isEmpty()) return true; for (ISeamComponentDeclaration d: c.getAllDeclarations()) { if(c.getName().equals(d.getName())) return false; } @@ -1512,7 +1512,7 @@ * @param changes */ void fireChanges(List<Change> changes) { - if(changes == null || changes.size() == 0) return; + if(changes == null || changes.isEmpty()) return; if(postponedChanges != null) { postponedChanges.addAll(changes); return; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPropertiesDeclaration.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -89,7 +89,7 @@ } else { String oldName = p1.getName(); List<Change> cc = p1.merge(p2); - if(cc != null && cc.size() > 0) children.addChildren(cc); + if(cc != null && !cc.isEmpty()) children.addChildren(cc); if(oldName != null && !oldName.equals(p1.getName())) { properties.remove(oldName); addProperty(p1); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -76,7 +76,7 @@ changes = Change.addChange(changes, new Change(this, SeamXMLConstants.ATTR_VALUE, old, value)); } else { List<Change> cs = ((SeamObject)value).merge((SeamObject)d.value); - if(cs != null && cs.size() > 0) { + if(cs != null && !cs.isEmpty()) { Change c = new Change(this, SeamXMLConstants.ATTR_VALUE, value, value); c.addChildren(cs); changes = Change.addChange(changes, c); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamValueMapEntry.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -54,14 +54,14 @@ SeamValueMapEntry e = (SeamValueMapEntry)s; List<Change> keyChanges = key.merge(e.key); - if(keyChanges != null && keyChanges.size() > 0) { + if(keyChanges != null && !keyChanges.isEmpty()) { Change keyChange = new Change(this, "key", key, key); //$NON-NLS-1$ keyChange.addChildren(keyChanges); changes = Change.addChange(changes, keyChange); } List<Change> valueChanges = value.merge(e.value); - if(valueChanges != null && valueChanges.size() > 0) { + if(valueChanges != null && !valueChanges.isEmpty()) { Change valueChange = new Change(this, "value", value, value); //$NON-NLS-1$ valueChange.addChildren(valueChanges); changes = Change.addChange(changes, valueChange); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXMLHelper.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -210,7 +210,7 @@ } public static void saveMap(Element parent, Map<String, IValueInfo> map, String child, Properties context) { - if(map == null || map.size() == 0) return; + if(map == null || map.isEmpty()) return; Element element = XMLUtilities.createElement(parent, child); for (String name: map.keySet()) { IValueInfo value = map.get(name); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -292,7 +292,7 @@ ELParser p = factory.createParser(); ELModel model = p.parse(el); List<ELInstance> is = model.getInstances(); - if(is.size() == 0) return null; + if(is.isEmpty()) return null; return is.get(0).getExpression(); } @@ -402,7 +402,7 @@ } // Save all resolved variables. It's useful for incremental validation. - if(resolvedVariables != null && resolvedVariables.size() > 0) { + if(resolvedVariables != null && !resolvedVariables.isEmpty()) { status.setUsedVariables(resolvedVariables); } @@ -539,7 +539,7 @@ } } members = newMembers; - if (members != null && members.size() > 0) + if (members != null && !members.isEmpty()) status.setLastResolvedToken(expr); } if (expr.getType() == ELObjectType.EL_METHOD_INVOCATION) { @@ -562,7 +562,7 @@ } } members = newMembers; - if (members != null && members.size() > 0) + if (members != null && !members.isEmpty()) status.setLastResolvedToken(expr); } return members; @@ -834,7 +834,7 @@ if (varName != null) { resolvedVars = SeamExpressionResolver.resolveVariables(project, scope, varName, onlyEqualNames); } - if (resolvedVars != null && resolvedVars.size() > 0) { + if (resolvedVars != null && !resolvedVars.isEmpty()) { List<ISeamContextVariable> newResolvedVars = new ArrayList<ISeamContextVariable>(); for (ISeamContextVariable var : resolvedVars) { if(!isFinal) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -347,7 +347,7 @@ if(member == null) { ELParser p = ELParserUtil.getJbossFactory().createParser(); ELModel m = p.parse(factory.getValue()); - ELInstance i = m.getInstances().size() == 0 ? null : m.getInstances().get(0); + ELInstance i = m.getInstances().isEmpty() ? null : m.getInstances().get(0); ELExpression ex = i == null ? null : i.getExpression(); if(ex instanceof ELInvocationExpression) { ELInvocationExpression expr = (ELInvocationExpression)ex; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -165,7 +165,7 @@ for (Iterator iterator = applications.iterator(); iterator.hasNext();) { ApplicationType application = (ApplicationType) iterator.next(); EList localeConfigs = application.getLocaleConfig(); - if(localeConfigs.size()>0) { + if(!localeConfigs.isEmpty()) { localeConfigExists = true; break; } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -833,7 +833,7 @@ } if(names.contains(defaultDs)) { model.setProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, defaultDs); - } else if(names.size()>0) { + } else if(!names.isEmpty()) { model.setProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, names.get(0)); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderMoveChange.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderMoveChange.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderMoveChange.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -62,7 +62,7 @@ */ @Override public boolean isRelevant() { - return relevantProperties.size()>0; + return !relevantProperties.isEmpty(); } /* (non-Javadoc) Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderRenameChange.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderRenameChange.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamFolderRenameChange.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -57,7 +57,7 @@ */ @Override public boolean isRelevant() { - return relevantProperties.size()>0; + return !relevantProperties.isEmpty(); } /* (non-Javadoc) Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamJavaPackageRenameChange.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamJavaPackageRenameChange.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamJavaPackageRenameChange.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -66,7 +66,7 @@ */ @Override public boolean isRelevant() { - return relevantPropertyIndexes.size()>0; + return !relevantPropertyIndexes.isEmpty(); } /* (non-Javadoc) Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamProjectRenameChange.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamProjectRenameChange.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamProjectRenameChange.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -62,7 +62,7 @@ */ @Override public boolean isRelevant() { - return relevantProjectNameProperties.size() > 0 || relevantSourceFolderProperties.size() > 0; + return !relevantProjectNameProperties.isEmpty() || !relevantSourceFolderProperties.isEmpty(); } /* Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ASTVisitorImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ASTVisitorImpl.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ASTVisitorImpl.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -59,7 +59,7 @@ AnnotatedASTNode<MethodDeclaration> currentAnnotatedMethod = null; public boolean hasSeamComponentItself() { - if(annotatedFields.size() > 0 || annotatedMethods.size() > 0) return true; + if(!annotatedFields.isEmpty() || !annotatedMethods.isEmpty()) return true; if(annotatedType != null && annotatedType.getAnnotations() != null) return true; return false; } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -104,7 +104,7 @@ types.put(BeanType.values()[i], v); } } - if(types.size() > 0) { + if(!types.isEmpty()) { component.setTypes(types); } } @@ -171,7 +171,7 @@ for (AnnotatedASTNode<MethodDeclaration> n: annotatedMethods) { Annotation main = getBijectedType(n, as, types); - if(as.size() == 0) continue; + if(as.isEmpty()) continue; boolean isDataModelSelectionType = !types.get(0).isUsingMemberName(); MethodDeclaration m = n.getNode(); @@ -213,7 +213,7 @@ for (AnnotatedASTNode<FieldDeclaration> n: annotatedFields) { Annotation main = getBijectedType(n, as, types); - if(as.size() == 0) continue; + if(as.isEmpty()) continue; boolean isDataModelSelectionType = !types.get(0).isUsingMemberName(); FieldDeclaration m = n.getNode(); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -163,7 +163,7 @@ types.put(t, v); } } - if(types.size() > 0) { + if(!types.isEmpty()) { component.setTypes(types); } @@ -239,7 +239,7 @@ types.add(BijectedAttributeType.values()[i]); } } - if(as.size() == 0) return; + if(as.isEmpty()) return; boolean isDataModelSelectionType = !types.get(0).isUsingMemberName(); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -351,7 +351,7 @@ private void validateComponent(IPath sourceFilePath, Set<ISeamComponent> checkedComponents, Set<IPath> unnamedResources) { Set<ISeamComponent> components = seamProject.getComponentsByPath(sourceFilePath); - if(components.size()==0) { + if(components.isEmpty()) { unnamedResources.add(sourceFilePath); return; } @@ -591,7 +591,7 @@ ISeamJavaComponentDeclaration javaDeclaration = component.getJavaDeclaration(); ISeamTextSourceReference classNameLocation = getNameLocation(javaDeclaration); Set<ISeamComponentMethod> methods = javaDeclaration.getMethodsByType(methodType); - if(methods==null || methods.size()==0) { + if(methods==null || methods.isEmpty()) { addError(STATEFUL_COMPONENT_DOES_NOT_CONTAIN_METHOD_SUFIX_MESSAGE_ID + postfixMessageId, preferenceKey, new String[]{component.getName()}, classNameLocation, javaDeclaration.getResource()); } } @@ -736,7 +736,7 @@ private void validateMethodOfUnknownComponent(SeamComponentMethodType methodType, ISeamJavaComponentDeclaration declaration, String sufixMessageId, String preferenceKey) { Set<ISeamComponentMethod> methods = declaration.getMethodsByType(methodType); - if(methods!=null && methods.size()>0) { + if(methods!=null && !methods.isEmpty()) { for (ISeamComponentMethod method : methods) { IMethod javaMethod = (IMethod)method.getSourceMember(); String methodName = javaMethod.getElementName(); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -332,7 +332,7 @@ ELParser parser = ELParserUtil.getJbossFactory().createParser(); ELModel model = parser.parse(string); List<SyntaxError> errors = model.getSyntaxErrors(); - if(errors.size() > 0) { + if(!errors.isEmpty()) { for (SyntaxError error: errors) { //TODO 1) make message more informative // 2) create other preference @@ -345,7 +345,7 @@ if (reporter.isCancelled()) { return; } - if(i.getErrors().size() > 0) { + if(!i.getErrors().isEmpty()) { //Already reported syntax problem in this piece of EL. continue; } @@ -385,7 +385,7 @@ } // Check pair for getter/setter - if(status.getUnpairedGettersOrSetters().size()>0) { + if(!status.getUnpairedGettersOrSetters().isEmpty()) { TypeInfoCollector.MethodInfo unpairedMethod = status.getUnpairedGettersOrSetters().values().iterator().next(); String methodName = unpairedMethod.getName(); String propertyName = status.getUnpairedGettersOrSetters().keySet().iterator().next(); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -59,7 +59,7 @@ ISeamValidator[] validators = new ISeamValidator[]{coreValidator, elValidator}; Set<IFile> changedFiles = coreHelper.getChangedFiles(); - if(changedFiles.size()>0) { + if(!changedFiles.isEmpty()) { status = validate(validators, changedFiles); } else { // reporter.removeAllMessages(this); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -50,7 +50,7 @@ Set<Object> updateLocks = new HashSet<Object>(); public boolean isUpdateLocked() { - return updateLocks.size() > 0; + return !updateLocks.isEmpty(); } public void addUpdateLock(Object lock) { Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -146,11 +146,7 @@ } if(stopped) break; if(!isLocked()) { - try { - updateAll(); - } catch (Exception t) { - SeamPagesXMLPlugin.log("Error while running page update", t); - } + updateAll(); } } } Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -78,7 +78,7 @@ Map<String, ISeamMessages> messages = findMessagesComponents(document, superRegion); - if (messages != null && messages.size() > 0) { + if (messages != null && !messages.isEmpty()) { String axis = getAxis(document, superRegion); String contentType = superRegion.getContentType(); String type = SEAM_MESSAGES_BEAN_PARTITION; @@ -91,7 +91,7 @@ } List<IJavaElement> javaElements = findJavaElements(document, superRegion); - if (javaElements != null && javaElements.size() > 0) {/// + if (javaElements != null && !javaElements.isEmpty()) {/// String axis = getAxis(document, superRegion); String contentType = superRegion.getContentType(); String type = SEAM_BEAN_PARTITION; @@ -268,12 +268,12 @@ Utils.findNodeForOffset(xmlDocument, region.getOffset()); Map<String, ISeamMessages> messages = findMessagesComponents(document, region); - if (messages != null && messages.size() > 0) { + if (messages != null && !messages.isEmpty()) { return true; } List<IJavaElement> javaElements = findJavaElements(document, region); - if (javaElements != null && javaElements.size() > 0) { + if (javaElements != null && !javaElements.isEmpty()) { return true; } @@ -324,7 +324,7 @@ } //Do not need it, vars handled in getJavaElementsForELOperandTokens - if (javaElements == null || javaElements.size() == 0) { + if (javaElements == null || javaElements.isEmpty()) { // Try to find a local Var (a pair of variable-value attributes) ElVarSearcher varSearcher = new ElVarSearcher(file, engine); // Find a Var in the EL Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -210,7 +210,7 @@ } } } - if (hyperlinks != null && hyperlinks.size() > 0) { + if (hyperlinks != null && !hyperlinks.isEmpty()) { return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]); } } catch (JavaModelException jme) { Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -96,7 +96,7 @@ private void openMessages() { Map <String, ISeamMessages> messages = fMessages; - if (messages == null || messages.size() == 0) { + if (messages == null || messages.isEmpty()) { // Nothing to open return; } @@ -104,7 +104,7 @@ for (String property : messages.keySet()) { ISeamMessages messagesComponent = messages.get(property); Map <String, IResource> resources = messagesComponent.getResourcesMap(); - if (resources == null || resources.size() == 0) + if (resources == null || resources.isEmpty()) continue; for (String bundle : resources.keySet()) { Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -98,7 +98,7 @@ if(range == null) range = new int[]{0, document.getLength()}; Map<String, ISeamMessages> messages = findMessagesComponents(document, file, wordRegion, range[0], range[1]); - if (messages != null && messages.size() > 0) + if (messages != null && !messages.isEmpty()) return new IHyperlink[] {new SeamELInJavaStringHyperlink(wordRegion, messages)}; IJavaElement[] elements = findJavaElements(document, file, wordRegion, range[0], range[1]); Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -34,7 +34,7 @@ */ protected void doHyperlink(IRegion region) { Map <String, ISeamMessages> messages = SeamBeanHyperlinkPartitioner.findMessagesComponents(getDocument(), region); - if (messages == null || messages.size() == 0) { + if (messages == null || messages.isEmpty()) { // Nothing to open openFileFailed(); return; @@ -43,7 +43,7 @@ for (String property : messages.keySet()) { ISeamMessages messagesComponent = messages.get(property); Map <String, IResource> resources = messagesComponent.getResourcesMap(); - if (resources == null || resources.size() == 0) + if (resources == null || resources.isEmpty()) continue; for (String bundle : resources.keySet()) { Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -35,7 +35,7 @@ if (xModel != null) { List list = provider.getList(xModel, WebPromptingProvider.JSF_GET_PATH, filename, null); - if (list != null && list.size() > 0) { + if (list != null && !list.isEmpty()) { for (Iterator i = list.iterator(); i.hasNext();) { Object o = i.next(); if (o instanceof String) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -237,7 +237,7 @@ tokens = tokens.getLeft(); } - if (variables.size() != 0) { + if (!variables.isEmpty()) { // Some variable/variables are found - perform search for their declarations varNames = new String[variables.size()]; for (int i = 0; i < variables.size(); i++) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/dialog/SeamFacetVersionChangeDialog.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/dialog/SeamFacetVersionChangeDialog.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/dialog/SeamFacetVersionChangeDialog.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -186,7 +186,7 @@ WizardDialog dialog = new WizardDialog(Display.getCurrent() .getActiveShell(), wiz); int ok = dialog.open(); - if ((ok == Dialog.OK) && (added.size() > 0)) { + if (ok == Dialog.OK && !added.isEmpty()) { SeamRuntimeManager.getInstance().addRuntime(added.get(0)); refreshSeamRuntimeCombo(); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -223,7 +223,7 @@ tokens = tokens.getLeft(); } - if (variables.size() != 0) { + if (!variables.isEmpty()) { // Some variable/variables are found - perform search for their declarations varNames = new String[variables.size()]; for (int i = 0; i < variables.size(); i++) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -546,7 +546,7 @@ .getSeamRuntimeDefaultValue(model); if (defaultRnt != null && runtimes.contains(defaultRnt)) { newValue = defaultRnt; - } else if (runtimes.size() > 0) { + } else if (!runtimes.isEmpty()) { newValue = runtimes.get(0); } } else { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -142,7 +142,7 @@ public Map<String, IStatus> validate(Object value, Object context) { Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate( value, context); - if (errors.size() > 0) { + if (!errors.isEmpty()) { errors = createErrorMap(); errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS)); @@ -180,7 +180,7 @@ public Map<String, IStatus> validate(Object value, Object context) { Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate( value, context); - if (errors.size() > 0) { + if (!errors.isEmpty()) { errors = createErrorMap(); errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/JDBCTablesColumnsReader.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/JDBCTablesColumnsReader.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/JDBCTablesColumnsReader.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -21,6 +21,7 @@ import org.hibernate.connection.ConnectionProvider; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.util.StringHelper; +import org.jboss.tools.seam.ui.SeamGuiPlugin; /** * @author Vitali @@ -104,6 +105,7 @@ metadataDialect.close(tableIterator); } } catch (Exception ignore) { + SeamGuiPlugin.getPluginLog().logError(ignore); } } } @@ -151,6 +153,7 @@ metadataDialect.close(columnIterator); } } catch (Exception ignore) { + SeamGuiPlugin.getPluginLog().logError(ignore); } } } @@ -192,6 +195,7 @@ try { currentCatalog = info.getConnectionProvider().getConnection().getCatalog(); } catch (SQLException ignore) { + SeamGuiPlugin.getPluginLog().logError(ignore); } } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/TablesColumnsCollector.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/TablesColumnsCollector.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/reveng/TablesColumnsCollector.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -301,7 +301,7 @@ */ public static final Bounds binaryBoundsSearch(List list, String prefix) { Bounds bounds = new Bounds(); - if (0 == list.size()) { + if (list.isEmpty()) { bounds.nL = bounds.nH = 0; return bounds; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -493,7 +493,7 @@ private String getDefaultConnectionProfile() { List<String> names = getProfileNameList(); - return names.size()>0?names.get(0):""; + return !names.isEmpty()?names.get(0):""; } private String getEjbProjectName() { @@ -536,7 +536,7 @@ return; } Map<String, IStatus> errors = ValidatorFactory.SEAM_RUNTIME_VALIDATOR.validate(value, null); - if(errors.size()>0) { + if(!errors.isEmpty()) { IStatus status = errors.get(IValidator.DEFAULT_ERROR); if(IStatus.ERROR == status.getSeverity()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); @@ -886,7 +886,7 @@ SeamRuntime runtime = SeamRuntimeManager.getDefaultRuntimeForProject(getSeamProject()); if(runtime==null) { List<String> names = getRuntimeNames(); - if(names.size()>0) { + if(!names.isEmpty()) { return names.get(0); } return ""; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -57,7 +57,7 @@ ISeamComponent component=null; if (seamProject != null) { Set<ISeamComponent> components = seamProject.getComponentsByPath(file.getFullPath()); - if (components.size() > 0) { + if (!components.isEmpty()) { // This is a component which we want to rename. component = components.iterator().next(); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -104,7 +104,7 @@ String variableName = tokens.getText(); //SeamSearchVisitor.tokensToString(tokens); Set<ISeamContextVariable> variables = seamProject.getVariablesByName(variableName); - if (variables != null && variables.size() > 0) { + if (variables != null && !variables.isEmpty()) { return search(javaScope, requestor, sourceFile, variables.toArray(new ISeamContextVariable[0]), monitor); } @@ -120,7 +120,7 @@ return Status.OK_STATUS; } - if (elements != null && elements.size() > 0) { + if (elements != null && !elements.isEmpty()) { return search(javaScope, requestor, sourceFile, elements.toArray(new IJavaElement[0]), monitor); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -431,7 +431,7 @@ } public void dragStart(DragSourceEvent event) { - event.doit= convertSelection().size() > 0; + event.doit= !convertSelection().isEmpty(); } public void dragSetData(DragSourceEvent event) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -469,7 +469,7 @@ if (fVarMatchers[i] != null && fVarMatchers[i].getFile() != null) fileList.add(fVarMatchers[i].getFile()); } - if (fileList.size() > 0) { + if (!fileList.isEmpty()) { files = fileList.toArray(new IFile[0]); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -460,7 +460,7 @@ } } - if (result == null || result.size() == 0) { + if (result == null || result.isEmpty()) { return NO_PROPOSALS; } ICompletionProposal[] resultArray = result.toArray(new ICompletionProposal[result.size()]); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -77,7 +77,7 @@ @Override public Object[] getEditorControls() { - if(controls.size()>0) return controls.toArray(); + if(!controls.isEmpty()) return controls.toArray(); else throw new IllegalStateException(SeamUIMessages.COMPOSITE_EDITOR_THIS_METOD_CAN_BE_INVOKED); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -144,7 +144,7 @@ */ private String checkCollection(Object value){ - return value != null && (((Collection)value).size() > 0) ? prepareCollectionToString((Collection)value) : ""; //$NON-NLS-1$ + return value != null && (!((Collection)value).isEmpty()) ? prepareCollectionToString((Collection)value) : ""; //$NON-NLS-1$ } /* Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -39,7 +39,7 @@ } radios = new Button[values.size()]; - if(defaultValue==null && values.size()>0) { + if(defaultValue==null && !values.isEmpty()) { defaultValue = values.get(0); } for (int i = 0; i < radios.length; i++) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -95,7 +95,7 @@ protected final void validatePage() { Map<String, IStatus> errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(editor.getValueAsString(), seamProject); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS)); setPageComplete(false); return; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -104,7 +104,7 @@ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate( getEditor(IParameter.SEAM_PROJECT_NAME).getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false); } else if(isWar()) { @@ -236,7 +236,7 @@ Map<String, IStatus> errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_COMPONENT_NAME).getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS)); setPageComplete(false); return; @@ -245,7 +245,7 @@ errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE)); setPageComplete(false); return; @@ -255,7 +255,7 @@ errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_BEAN_NAME).getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),"Bean")); //$NON-NLS-1$ setPageComplete(false); return; @@ -265,7 +265,7 @@ IFieldEditor editor = editorRegistry.get(IParameter.SEAM_PACKAGE_NAME); if(editor!=null) { errors = ValidatorFactory.PACKAGE_NAME_VALIDATOR.validate(editor.getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); //$NON-NLS-1$ setPageComplete(false); return; @@ -275,7 +275,7 @@ errors = ValidatorFactory.SEAM_METHOD_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_METHOD_NAME).getValue(), new Object[]{"Method",project}); //$NON-NLS-1$ - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); setPageComplete(false); return; @@ -284,7 +284,7 @@ errors = ValidatorFactory.FILE_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_PAGE_NAME).getValue(), new Object[]{"Page",project}); //$NON-NLS-1$ - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); setPageComplete(false); return; @@ -293,7 +293,7 @@ errors = ValidatorFactory.SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE,project}); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(null); setMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage(),IMessageProvider.WARNING); setPageComplete(true); @@ -353,7 +353,7 @@ Map<String, IStatus> errors; String seamRt = SeamCorePlugin.getSeamPreferences(project).get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,""); //$NON-NLS-1$ errors = ValidatorFactory.SEAM_RUNTIME_VALIDATOR.validate(seamRt, null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); setPageComplete(false); return false; @@ -365,7 +365,7 @@ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue(), null); - if(errors.size()>0 || !isProjectSettingsOk()) { + if(!errors.isEmpty() || !isProjectSettingsOk()) { IStatus errorStatus = errors.get(IValidator.DEFAULT_ERROR); String errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS; if(errorStatus!=null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -146,7 +146,7 @@ Map<String, IStatus> errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_ENTITY_CLASS_NAME).getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME)); setPageComplete(false); return; @@ -155,7 +155,7 @@ IFieldEditor editor = editorRegistry.get(IParameter.SEAM_PACKAGE_NAME); if(editor!=null) { errors = ValidatorFactory.PACKAGE_NAME_VALIDATOR.validate(editor.getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); //$NON-NLS-1$ setPageComplete(false); return; @@ -165,7 +165,7 @@ errors = ValidatorFactory.FILE_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_MASTER_PAGE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE,project,project}); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); setPageComplete(false); return; @@ -174,7 +174,7 @@ errors = ValidatorFactory.FILE_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_PAGE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_PAGE,project}); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); setPageComplete(false); return; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -69,7 +69,7 @@ projectEditor.addPropertyChangeListener(this); if(projectName!=null && projectName.length()>0) { Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null); - if(errors.size()>0) { + if(!errors.isEmpty()) { IStatus message = errors.get(IValidator.DEFAULT_ERROR); if(message.getSeverity()==IStatus.ERROR) { setErrorMessage(message.getMessage()); @@ -199,7 +199,7 @@ Map<String, IStatus> errors; String seamRt = SeamCorePlugin.getSeamPreferences(project).get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,""); //$NON-NLS-1$ errors = ValidatorFactory.SEAM_RUNTIME_VALIDATOR.validate(seamRt, null); - if(errors.size()>0) { + if(!errors.isEmpty()) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage()); setPageComplete(false); return false; @@ -210,7 +210,7 @@ private void validate() { Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null); - if(errors.size()>0 || !isProjectSettingsOk()) { + if(!errors.isEmpty() || !isProjectSettingsOk()) { IStatus errorMessage = errors.get(IValidator.DEFAULT_ERROR); if(errorMessage==null) { setErrorMessage(SeamUIMessages.VALIDATOR_INVALID_SETTINGS); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -500,7 +500,7 @@ .getActiveShell(), wiz); dialog.open(); - if (added.size() > 0) { + if (!added.isEmpty()) { SeamRuntimeManager.getInstance().addRuntime(added.get(0)); List<String> runtimes = getRuntimeNames(sv); getFieldEditor().setValue(added.get(0).getName()); @@ -574,7 +574,7 @@ configurationNames.add(configs[i].getName()); } if(defaultSelection==null) { - if(configurationNames.size()>0) { + if(!configurationNames.isEmpty()) { defaultSelection = configurationNames.get(0); } else { defaultSelection = ""; //$NON-NLS-1$ Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -29,7 +29,7 @@ } public boolean canExecute() { - if(elements.size() > 0){ + if(!elements.isEmpty()){ XModelObject[] objects = (XModelObject[])elements.toArray(new XModelObject[]{}); XModelObject object= objects[0]; if(elements.size() == 1) objects = null; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -223,7 +223,7 @@ int height = getVisualHeight() + getPageModel().getOutputLinks().size() * NodeFigure.LINK_HEIGHT; - if (getPageModel().getOutputLinks().size() == 0) + if (getPageModel().getOutputLinks().isEmpty()) height = getVisualHeight() + NodeFigure.LINK_HEIGHT; String name = getPageModel().getName(); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -234,7 +234,7 @@ if(getPagesModel().getChildren().get(i) instanceof Page){ Page page = (Page)getPagesModel().getChildren().get(i); - if(page.getChildren().size() > 0 && page.isParamsVisible()){ + if(!page.getChildren().isEmpty() && page.isParamsVisible()){ PageWrapper wrapper = page.getParamList(); list.add(wrapper); } @@ -262,7 +262,7 @@ if (val != null && val.booleanValue()) snapStrategies.add(new SnapToGrid(this)); - if (snapStrategies.size() == 0) + if (snapStrategies.isEmpty()) return null; if (snapStrategies.size() == 1) return (SnapToHelper) snapStrategies.get(0); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -45,7 +45,7 @@ } public void refreshFont() { - if (getChildren().size() > 0 && getChildren().get(0) instanceof Label) { + if (!getChildren().isEmpty() && getChildren().get(0) instanceof Label) { Label label = (Label) getChildren().get(0); // label.setFont(editPart.getLinkModel().getJSFModel().getOptions() // .getLinkPathFont()); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -162,7 +162,7 @@ g.drawString(page.getName(), 27, 3); } - if(page.getChildren().size() != 0){ + if(!page.getChildren().isEmpty()){ if(page.isParamsVisible()){ g.drawImage(minusImage, 4, height-12); }else{ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -50,8 +50,6 @@ Element rootElement = document.getDocumentElement(); NodeList nodeList = rootElement.getElementsByTagName(NAMESPACE); return nodeList.item(0).getFirstChild().getNodeValue(); - } catch (Exception e) { - VpePlugin.reportProblem(e); } finally { if(document!=null) { VpeCreatorUtil.releaseDocumentFromRead(document); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -188,7 +188,7 @@ double dVersion; try { dVersion = Double.parseDouble(parseableVersion); - } catch (Exception e) { + } catch (NumberFormatException e) { VpePlugin.getPluginLog().logError(e); dVersion = 0.0; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.util; +import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Map; @@ -49,7 +50,7 @@ } is.close(); - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/Messages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/Messages.java 2009-05-11 16:55:55 UTC (rev 15216) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/Messages.java 2009-05-12 00:52:12 UTC (rev 15217) @@ -31,9 +31,15 @@ try { Field field = c.getDeclaredField(fieldName); return (String) field.get(null); - } catch (Exception e) { + } catch (NoSuchFieldException e) { PalettePlugin.getPluginLog().logError(e); return "!" + fieldName + "!"; //$NON-NLS-1$ //$NON-NLS-2$ + } catch (IllegalArgumentException e) { + PalettePlugin.getPluginLog().logError(e); + return "!" + fieldName + "!"; //$NON-NLS-1$ //$NON-NLS-2$ + } catch (IllegalAccessException e) { + PalettePlugin.getPluginLog().logError(e); + return "!" + fieldName + "!"; //$NON-NLS-1$ //$NON-NLS-2$ } } }