Author: scabanovich Date: 2008-04-04 08:31:50 -0400 (Fri, 04 Apr 2008) New Revision: 7325 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPTokenizer.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/AuxiliaryFileLauncher.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/GroupEditPart.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/PageEditPart.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/ImportJSFWarOperation.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFFlowTabbedPreferencesPage.java Log: JBIDE-895 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -17,7 +17,6 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.commands.ActionHandler; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.actions.ActionFactory; @@ -25,7 +24,6 @@ import org.eclipse.ui.ide.IDEActionFactory; import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.common.gef.action.ActionRegistrySupport; -import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.ui.editor.FacesConfigGuiEditor; import org.jboss.tools.jsf.ui.editor.actions.JSFCutRetargetAction; @@ -66,7 +64,7 @@ ActionRegistry registry = null; if(fActiveEditorPart instanceof FacesConfigGuiEditor) registry = (ActionRegistry)part.getAdapter(ActionRegistry.class); - Iterator globalActionKeys = registrySupport.getGlobalActionKeys(); + Iterator<String> globalActionKeys = registrySupport.getGlobalActionKeys(); while(globalActionKeys.hasNext()) { String id = (String)globalActionKeys.next(); actionBars.setGlobalActionHandler(id, (registry == null ? null : registry.getAction(id))); @@ -120,13 +118,9 @@ actionBars.updateActionBars(); } - try { - if(fToggleOccurencesMarkUp != null) { - fToggleOccurencesMarkUp.setEditor(getTextEditor(part)); - fToggleOccurencesMarkUp.update(); - } - } catch (Exception x) { - JsfUiPlugin.getPluginLog().logError(x); + if(fToggleOccurencesMarkUp != null) { + fToggleOccurencesMarkUp.setEditor(getTextEditor(part)); + fToggleOccurencesMarkUp.update(); } updateStatus(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPAdopt.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -12,6 +12,7 @@ import java.util.*; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.source.SourceViewer; import org.jboss.tools.common.meta.XAdoptManager; import org.jboss.tools.common.model.XModelObject; @@ -33,13 +34,9 @@ } protected boolean isAdoptableNature(XModelObject target) { - try { - String nature = (String)target.getModel().getProperties().get("nature"); - return JSF_NATURE_STRING.equalsIgnoreCase(nature); - } catch (Exception x) { - JsfUiPlugin.getPluginLog().logError("Error in checking nature", x); - } - return false; + if(target == null) return false; + String nature = (String)target.getModel().getProperties().get("nature"); + return JSF_NATURE_STRING.equalsIgnoreCase(nature); } protected boolean isAdoptableBundle(XModelObject object) { @@ -56,21 +53,22 @@ String bundle = getBundle(object.getParent()); int pos = -1; try { - String s = p.getProperty("pos"); + String s = p == null ? null : p.getProperty("pos"); if(s != null && s.length() > 0) pos = Integer.parseInt(s); - } catch (Exception e) { + } catch (NumberFormatException e) { JsfUiPlugin.getPluginLog().logError(e); } SourceViewer viewer = (SourceViewer)p.get("viewer"); - - JSPTokenizer tokenizer = new JSPTokenizer(); - Token root = null; - try { - root = tokenizer.parse(viewer.getDocument()); - } catch (Exception e) { - JsfUiPlugin.getPluginLog().logError(e); + if(viewer == null) { + JsfUiPlugin.getPluginLog().logError("Viewer is null", new NullPointerException("Viewer is null")); return; } + if(viewer.getDocument() == null) { + return; + } + + JSPTokenizer tokenizer = new JSPTokenizer(); + Token root = tokenizer.parse(viewer.getDocument()); Token t = root.firstChild; while(t != null) { t = t.nextSibling; @@ -86,7 +84,7 @@ if(prefix.equals("???")) { WebPromptingProvider fProvider = WebPromptingProvider.getInstance(); - List l = fProvider.getList(target.getModel(), WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, null); + List<Object> l = fProvider.getList(target.getModel(), WebPromptingProvider.JSF_REGISTERED_BUNDLES, null, null); int map_index = 1; Map map = l.size() <= map_index ? null : (Map)l.get(map_index); if(map != null && map.containsKey(bundle)) prefix = map.get(bundle).toString(); @@ -102,7 +100,7 @@ try { viewer.getDocument().replace(bp, 0, loadBundle); if(pos >= bp) pos += loadBundle.length(); - } catch (Exception e) { + } catch (BadLocationException e) { JsfUiPlugin.getPluginLog().logError(e); } } @@ -115,7 +113,7 @@ viewer.getDocument().replace(pos, 0, start); viewer.setSelectedRange(pos, 0); viewer.getTextWidget().setFocus(); - } catch (Exception e) { + } catch (BadLocationException e) { JsfUiPlugin.getPluginLog().logError(e); } p.remove("start text"); @@ -139,14 +137,10 @@ private int getContextIndex(JSPTokenizer tokenizer, int pos) { if(tokenizer.root == null) return -1; if (tokenizer.isInTagAttributeValue(pos)) return 0; - try { - Token e = tokenizer.getTokenAt(pos); - if(e == null) return -1; - if (e.kind == JSPTokenizer.TEXT || (pos == e.off)) { - return 1; - } - } catch (Exception x) { - JsfUiPlugin.getPluginLog().logError(x); + Token e = tokenizer.getTokenAt(pos); + if(e == null) return -1; + if (e.kind == JSPTokenizer.TEXT || (pos == e.off)) { + return 1; } return -1; } @@ -163,21 +157,17 @@ int pos = -1; try { - String s = p.getProperty("pos"); + String s = p == null ? null : p.getProperty("pos"); if(s != null && s.length() > 0) pos = Integer.parseInt(s); - } catch (Exception e) { + } catch (NumberFormatException e) { JsfUiPlugin.getPluginLog().logError(e); } SourceViewer viewer = (SourceViewer)p.get("viewer"); + + if(viewer == null || viewer.getDocument() == null) return; JSPTokenizer tokenizer = new JSPTokenizer(); - Token root = null; - try { - root = tokenizer.parse(viewer.getDocument()); - } catch (Exception e) { - JsfUiPlugin.getPluginLog().logError(e); - return; - } + Token root = tokenizer.parse(viewer.getDocument()); int contextIndex = getContextIndex(tokenizer, pos); String start = bundle; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPTokenizer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPTokenizer.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/adopt/JSPTokenizer.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -33,7 +33,7 @@ int start = -1; int end = -1; - public Token parse(IDocument document) throws Exception { + public Token parse(IDocument document) { selectionStart = 0; selectionEnd = document.getLength(); text = document.get(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/AuxiliaryFileLauncher.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/AuxiliaryFileLauncher.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/AuxiliaryFileLauncher.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -30,9 +30,9 @@ IResource r = file.getParent().findMember(s); if(!(r instanceof IFile) || !r.exists()) return; IWorkbenchPage workbenchPage = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); - try { + if(workbenchPage != null) try { workbenchPage.openEditor(new FileEditorInput((IFile)r), "org.jboss.tools.common.model.ui.editor.EditorPartWrapper"); - } catch (Exception e) { + } catch (PartInitException e) { JsfUiPlugin.getPluginLog().logError(e); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/DndHelper.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -12,6 +12,7 @@ import java.util.Properties; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XModelTransferBuffer; @@ -40,7 +41,7 @@ properties.setProperty("actionSourceGUIComponentID", "editor"); try { copy.executeHandler((XModelObject) source, properties); - } catch (Exception e) { + } catch (XModelException e) { JsfUiPlugin.getPluginLog().logError(e); XModelTransferBuffer.getInstance().disable(); return false; @@ -64,7 +65,7 @@ } try { DnDUtil.paste((XModelObject) target, properties); - } catch (Exception ex) { + } catch (XModelException ex) { JsfUiPlugin.getPluginLog().logError(ex); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/GroupEditPart.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/GroupEditPart.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/GroupEditPart.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -26,6 +26,7 @@ import org.eclipse.swt.accessibility.AccessibleEvent; import org.jboss.tools.common.meta.action.XAction; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.ui.editor.figures.GroupFigure; @@ -61,7 +62,7 @@ if (action != null) action.executeHandler((XModelObject) getGroupModel() .getSource(), null); - } catch (Exception e) { + } catch (XModelException e) { JsfUiPlugin.getPluginLog().logError(e); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/PageEditPart.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/PageEditPart.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/PageEditPart.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -24,6 +24,7 @@ import org.eclipse.swt.accessibility.AccessibleEvent; import org.jboss.tools.common.meta.action.XAction; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.ui.editor.figures.PageFigure; @@ -55,7 +56,7 @@ if (action != null) action.executeHandler( (XModelObject) getPageModel().getSource(), null); - } catch (Exception e) { + } catch (XModelException e) { JsfUiPlugin.getPluginLog().logError(e); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/ImportJSFWarOperation.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/ImportJSFWarOperation.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/ImportJSFWarOperation.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -11,6 +11,7 @@ package org.jboss.tools.jsf.ui.operation; import java.io.File; +import java.io.IOException; import org.eclipse.core.commands.operations.AbstractOperation; import org.eclipse.core.resources.IResource; @@ -54,7 +55,7 @@ if(!warContext.isClassicEclipseProject()) { try { FileUtil.unjar(target, warLocation); - } catch (Exception e) { + } catch (IOException e) { JsfUiPlugin.getPluginLog().logError(e); } for (int i = 0; i < os.length; i++) { @@ -66,7 +67,7 @@ File webContent = new File(target, "WebContent"); try { FileUtil.unjar(webContent, warLocation); - } catch (Exception e) { + } catch (IOException e) { JsfUiPlugin.getPluginLog().logError(e); } for (int i = 0; i < os.length; i++) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFFlowTabbedPreferencesPage.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFFlowTabbedPreferencesPage.java 2008-04-04 12:25:29 UTC (rev 7324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFFlowTabbedPreferencesPage.java 2008-04-04 12:31:50 UTC (rev 7325) @@ -14,7 +14,6 @@ import org.eclipse.ui.*; import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintAList; import org.jboss.tools.common.model.*; -import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.web.JSFTemplate; public class JSFFlowTabbedPreferencesPage extends TabbedPreferencesPage implements IWorkbenchPreferencePage { @@ -33,12 +32,10 @@ public void init(IWorkbench workbench) {} void initTemplateList(XModelObject addView) { - try { - JSFTemplate templates = new JSFTemplate(); - XAttributeConstraintAList l = (XAttributeConstraintAList)addView.getModelEntity().getAttribute("Page Template").getConstraint(); - l.setValues(templates.getPageTemplateList()); - } catch (Exception e) { - JsfUiPlugin.getPluginLog().logError(e); - } + if(addView == null) return; + JSFTemplate templates = new JSFTemplate(); + XAttributeConstraintAList l = (XAttributeConstraintAList)addView.getModelEntity().getAttribute("Page Template").getConstraint(); + l.setValues(templates.getPageTemplateList()); } + }