[jbosstools-commits] JBoss Tools SVN: r9254 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor and 14 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Jul 23 17:47:32 EDT 2008
Author: dgolovin
Date: 2008-07-23 17:47:32 -0400 (Wed, 23 Jul 2008)
New Revision: 9254
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandlerLoadingException.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/xpl/DragNodeCommand2.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelectionBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFile.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.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/template/resize/VpeResizer.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java
Log:
Cleanup VPE code:
1. Unnecessary catch(Exception ex) blocks were removed;
2. Catch(Exception ex) blocks were converted to catch particular exception(s);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -112,7 +112,7 @@
URL url = null;
try {
url = bundle == null ? null : FileLocator.resolve(bundle.getEntry("/resources"));
- } catch (Exception e) {
+ } catch (IOException e) {
url = bundle.getEntry("/resources");
}
return (url == null) ? null : url.getPath();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -18,6 +18,7 @@
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jface.action.IAction;
@@ -329,7 +330,7 @@
} else
return null;
- } catch (Exception e) {
+ } catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
return null;
}
@@ -348,7 +349,7 @@
file.setPersistentProperty(SPLITTER_POSITION_KEY2, s);
s = String.valueOf(weights[2]);
file.setPersistentProperty(SPLITTER_POSITION_KEY3, s);
- } catch (Exception e) {
+ } catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
}
}
@@ -640,7 +641,7 @@
window.getPartService().addPartListener(activationListener);
window.getShell().addShellListener(activationListener);
- } catch (Exception e) {
+ } catch (CoreException e) {
VpePlugin.reportProblem(e);
}
// setVisualMode(visualMode);
@@ -731,7 +732,7 @@
visualEditor = new MozillaEditor();
try {
visualEditor.init(getEditorSite(), getEditorInput());
- } catch (Exception e) {
+ } catch (PartInitException e) {
VpePlugin.reportProblem(e);
}
if (visualEditor != null) {
@@ -766,7 +767,7 @@
}
});
previewWebBrowser.createPartControl(previewContent);
- } catch (Exception e) {
+ } catch (PartInitException e) {
VpePlugin.reportProblem(e);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.vpe.editor;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
@@ -117,7 +118,7 @@
IndexedRegion region = (IndexedRegion)sourceNode;
String text = sourceBuilder.getStructuredTextViewer().getDocument().get(region.getStartOffset(), region.getEndOffset()-region.getStartOffset());
pos = TextUtil.sourcePosition(text, visualSelectedNode.getNodeValue(), selection.getFocusOffset());
- }catch(Exception ex){
+ }catch(BadLocationException ex){
VpePlugin.reportProblem(ex);
}
sourceBuilder.setSelection(sourceNode, pos, 0);
@@ -135,7 +136,7 @@
IndexedRegion region = (IndexedRegion)sourceNode;
String text = sourceBuilder.getStructuredTextViewer().getDocument().get(region.getStartOffset(), region.getEndOffset()-region.getStartOffset());
pos = TextUtil.sourcePosition(text, visualSelectedNode.getNodeValue(), selection.getFocusOffset());
- }catch(Exception ex){
+ }catch(BadLocationException ex){
VpePlugin.reportProblem(ex);
}
sourceBuilder.setSelection(sourceNode, pos, 0);
@@ -222,7 +223,7 @@
String text = sourceBuilder.getStructuredTextViewer().getDocument().get(region.getStartOffset(), region.getEndOffset()-region.getStartOffset());
start = TextUtil.sourcePosition(text, visualSelectedAncestor.getNodeValue(), selection.getAnchorOffset());
end = TextUtil.sourcePosition(text, visualSelectedAncestor.getNodeValue(), selection.getFocusOffset());
- }catch(Exception ex){
+ }catch(BadLocationException ex){
VpePlugin.reportProblem(ex);
}
@@ -240,7 +241,7 @@
String text = sourceBuilder.getStructuredTextViewer().getDocument().get(region.getStartOffset(), region.getEndOffset()-region.getStartOffset());
start = TextUtil.sourcePosition(text, sourceAncestor.getNodeValue(), selection.getAnchorOffset());
end = TextUtil.sourcePosition(text, sourceAncestor.getNodeValue(), selection.getFocusOffset());
- }catch(Exception ex){
+ }catch(BadLocationException ex){
VpePlugin.reportProblem(ex);
}
sourceBuilder.setSelection(sourceAncestor, start, end - start);
@@ -299,7 +300,7 @@
String visualValue = visualNode.getNodeValue();
return start + TextUtil.sourcePosition(sourceText, visualValue, visualValue.length());
}
- } catch(Exception ex){
+ } catch(BadLocationException ex){
VpePlugin.reportProblem(ex);
return 0;
}
@@ -382,12 +383,8 @@
if(sourceNode.getNodeType()!=Node.TEXT_NODE) {
sourceBuilder.setSelection(sourceNode, 0, 0);
} else if(sourceNode.getNodeType()==Node.TEXT_NODE) {
- try{
- IndexedRegion region = (IndexedRegion)sourceNode;
- sourceBuilder.setSelection(sourceNode, 0, region.getLength());
- }catch(Exception ex){
- VpePlugin.reportProblem(ex);
- }
+ IndexedRegion region = (IndexedRegion)sourceNode;
+ sourceBuilder.setSelection(sourceNode, 0, region.getLength());
}
return sourceNode;
}
@@ -902,7 +899,7 @@
int start = region.getStartOffset();
String text = sourceBuilder.getStructuredTextViewer().getDocument().get(start, region.getEndOffset() - start);
position = start + TextUtil.sourcePosition(text, visualSelectedNode.getNodeValue(), visualInitOffset);
- }catch(Exception ex){
+ }catch(BadLocationException ex){
VpePlugin.reportProblem(ex);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -336,17 +336,14 @@
// }
//Added by Max Areshkau in scope of bug JBIDE-1209
} else {
- try{
- IndexedRegion region = (IndexedRegion)sourceParent;
- String text = sourceParent.getNodeValue();
- int start= TextUtil.sourcePosition(text, visualText.getNodeValue(), offset);
- int end =TextUtil.sourcePosition(text, visualText.getNodeValue(), offset+length);
- offset=start;
- length=end-start;
- }catch(Exception ex){
- VpePlugin.reportProblem(ex);
- }
- setSelection(sourceParent, offset, length);
+ IndexedRegion region = (IndexedRegion)sourceParent;
+ String text = sourceParent.getNodeValue();
+ int start= TextUtil.sourcePosition(text, visualText.getNodeValue(), offset);
+ int end =TextUtil.sourcePosition(text, visualText.getNodeValue(), offset+length);
+ offset=start;
+ length=end-start;
+
+ setSelection(sourceParent, offset, length);
}
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
@@ -30,6 +31,7 @@
import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants;
import org.eclipse.wst.xml.core.internal.document.AttrImpl;
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
+import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
import org.eclipse.wst.xml.core.internal.document.TextImpl;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.jboss.tools.jst.jsp.editor.ITextFormatter;
@@ -241,13 +243,8 @@
private boolean paste() {
- try {
sourceEditor.getAction(ActionFactory.PASTE.getId()).run();
return true;
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
- return false;
- }
}
private boolean deleteRight() {
@@ -399,7 +396,7 @@
atLeastOneCharIsDeleted = true;
continue;
}
- } catch(Exception e) {
+ } catch(BadLocationException e) {
VpePlugin.getPluginLog().logError(e);
}
}
@@ -743,7 +740,7 @@
atLeastOneCharIsDeleted = true;
return selection;
}
- } catch(Exception ex) {
+ } catch(BadLocationException ex) {
VpePlugin.getPluginLog().logError(ex);
}
}
@@ -895,68 +892,52 @@
}
private boolean isVisualEditableForNode(Node node) {
- try {
- nsIDOMNode visualNode = domMapping.getVisualNode(node);
- if (visualNode.getNodeType() == Node.ELEMENT_NODE) {
- nsIDOMNode styleAttr = visualNode.getAttributes().getNamedItem("style");
- if (styleAttr != null) {
- String style = styleAttr.getNodeValue();
- if (style != null) {
- if (style.indexOf(VpeHtmlTemplate.ATTR_STYLE_MODIFY_READ_ONLY_VALUE) < 0) {
- return true;
- }
+
+ nsIDOMNode visualNode = domMapping.getVisualNode(node);
+ if (visualNode.getNodeType() == Node.ELEMENT_NODE) {
+ nsIDOMNode styleAttr = visualNode.getAttributes().getNamedItem("style");
+ if (styleAttr != null) {
+ String style = styleAttr.getNodeValue();
+ if (style != null) {
+ if (style.indexOf(VpeHtmlTemplate.ATTR_STYLE_MODIFY_READ_ONLY_VALUE) < 0) {
+ return true;
}
}
- } else if (visualNode.getNodeType() == Node.TEXT_NODE) {
- return true;
}
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
+ } else if (visualNode.getNodeType() == Node.TEXT_NODE) {
+ return true;
}
return false;
}
private boolean isVisualNodeSourceAttribute(Node node) {
- try {
- nsIDOMNode visualNode = domMapping.getVisualNode(node);
- VpeNodeMapping nm = domMapping.getNodeMapping(visualNode);
- if (nm.getType() == VpeNodeMapping.ELEMENT_MAPPING) {
- VpeElementMapping em = (VpeElementMapping)nm;
- return em.getTemplate().isOutputAttributes();
- }
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
+ nsIDOMNode visualNode = domMapping.getVisualNode(node);
+ VpeNodeMapping nm = domMapping.getNodeMapping(visualNode);
+ if (nm.getType() == VpeNodeMapping.ELEMENT_MAPPING) {
+ VpeElementMapping em = (VpeElementMapping)nm;
+ return em.getTemplate().isOutputAttributes();
}
return false;
}
private boolean isVisualNodeEmpty(Node node) {
- try {
- nsIDOMNode visualNode = domMapping.getVisualNode(node);
- return pageContext.getVisualBuilder().isEmptyElement(visualNode);
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
- }
- return false;
+ nsIDOMNode visualNode = domMapping.getVisualNode(node);
+ return pageContext.getVisualBuilder().isEmptyElement(visualNode);
}
private Attr getVisualNodeSourceAttribute(Node node) {
- try {
- nsIDOMNode visualNode = domMapping.getVisualNode(node);
- if(visualNode==null) {
- return null;
+ nsIDOMNode visualNode = domMapping.getVisualNode(node);
+ if(visualNode==null) {
+ return null;
+ }
+ VpeNodeMapping nm = domMapping.getNodeMapping(visualNode);
+ if (nm.getType() == VpeNodeMapping.ELEMENT_MAPPING) {
+ VpeElementMapping mapping = (VpeElementMapping)nm;
+ String[] names = mapping.getTemplate().getOutputAtributeNames();
+ if(names!=null) {
+ String name = names[0];
+ return (Attr)node.getAttributes().getNamedItem(name);
}
- VpeNodeMapping nm = domMapping.getNodeMapping(visualNode);
- if (nm.getType() == VpeNodeMapping.ELEMENT_MAPPING) {
- VpeElementMapping mapping = (VpeElementMapping)nm;
- String[] names = mapping.getTemplate().getOutputAtributeNames();
- if(names!=null) {
- String name = names[0];
- return (Attr)node.getAttributes().getNamedItem(name);
- }
- }
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
}
return null;
}
@@ -1158,12 +1139,8 @@
Node focusNode = selection.getFocusNode();
int formatStart = 0;
- try {
- formatStart = ((IDOMNode)focusNode).getStartOffset();
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
- }
-
+ formatStart = ((IDOMNode)focusNode).getStartOffset();
+
VpeNodeMapping parentMapping = domMapping.getNearParentMapping(focusNode);
if (parentMapping != null) {
boolean handled = false;
@@ -1226,15 +1203,11 @@
}
}
- try {
- StructuredTextViewer viewer = sourceEditor.getTextViewer();
- if (region != null){
- if (sourceEditor instanceof ITextFormatter) {
- ((ITextFormatter)sourceEditor).formatTextRegion(sourceEditor.getTextViewer().getDocument(), region);
- }
- }
- } catch (Exception x) {
- VpePlugin.reportProblem(x);
+ StructuredTextViewer viewer = sourceEditor.getTextViewer();
+ if (region != null){
+ if (sourceEditor instanceof ITextFormatter) {
+ ((ITextFormatter)sourceEditor).formatTextRegion(sourceEditor.getTextViewer().getDocument(), region);
+ }
}
return true;
}
@@ -1252,7 +1225,7 @@
break;
}
return linePrefix.substring(0, linePrefixLength);
- } catch (Exception e) {
+ } catch (BadLocationException e) {
VpePlugin.getPluginLog().logError(e);
return "";
}
@@ -1274,7 +1247,7 @@
try {
String source = ((TextImpl)node).getSource();
((TextImpl)node).setSource(source.substring(0, so) + source.substring(eo));
- } catch (Exception e) {
+ } catch (InvalidCharacterException e) {
VpePlugin.getPluginLog().logError(e);
}
if (node.getNodeValue().trim().length() == 0) {
@@ -1385,7 +1358,6 @@
}
private boolean isTextToSkip(char[] chars, int position) {
- try {
if (chars[position] == ' ')
return true;
@@ -1393,12 +1365,7 @@
TextUtil.isWhitespaceText(new String(chars, position, chars.length - position))) {
return true;
}
-
return false;
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
- return true;
- }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -25,6 +25,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -114,7 +115,7 @@
if (project.getNature(JSF_PROJECT_NATURES[i]) != null)
return true;
}
- } catch (Exception e) {
+ } catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
}
return false;
@@ -186,7 +187,7 @@
IFile file = (IFile)project.getWorkspace().getRoot().getFolder(es[i].getPath()).findMember("/"+name);
if(file != null && file.exists()) return file;
}
- } catch (Exception e) {
+ } catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
return null;
}
@@ -317,7 +318,7 @@
String value;
try{
value = (String)entry.bundle.getObject(key.key);
- }catch(Exception ex){
+ }catch(MissingResourceException ex){
value = null;
fireBundleKeyChanged(key.prefix, key.key, value);
usedKeys.remove(key);
@@ -413,7 +414,7 @@
if(!usedKeys.containsKey(name))
usedKeys.put(name, new UsedKey(entry.uri, prefix, propertyName, value, entry.hashCode, entry.offset));
return value;
- }catch(Exception ex){
+ }catch(MissingResourceException ex){
return null;
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -24,6 +24,7 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
import org.jboss.tools.common.kb.KbConnectorFactory;
@@ -89,12 +90,16 @@
}
public void refreshConnector() {
- try {
IDocument document = sourceBuilder.getStructuredTextViewer().getDocument();
- connector = (WtpKbConnector)KbConnectorFactory.getIntstance().createConnector(KbConnectorType.JSP_WTP_KB_CONNECTOR, document);
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
- }
+ try {
+ connector = (WtpKbConnector)KbConnectorFactory.getIntstance().createConnector(KbConnectorType.JSP_WTP_KB_CONNECTOR, document);
+ } catch (InstantiationException e) {
+ VpePlugin.getPluginLog().logError(e);
+ } catch (IllegalAccessException e) {
+ VpePlugin.getPluginLog().logError(e);
+ } catch (ClassNotFoundException e) {
+ VpePlugin.getPluginLog().logError(e);
+ }
}
public VpeVisualDomBuilder getVisualBuilder(){
@@ -219,7 +224,7 @@
if (f != null) {
IDE.openEditor(workbenchPage, f, true);
}
- }catch(Exception ex){
+ }catch(PartInitException ex){
VpePlugin.reportProblem(ex);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferenceList.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferenceList.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferenceList.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -86,7 +86,7 @@
String s = null;
try {
s = resource.getPersistentProperty(getPropertyName());
- } catch (Exception e) {
+ } catch (CoreException e) {
//ignore
}
if(s == null || s.length() == 0) return new String[0];
@@ -121,7 +121,7 @@
String newValue = encodeDeclaredResources(entries, scope, depth);
if(oldValue.equals(newValue)) return false;
resource.setPersistentProperty(getPropertyName(), newValue);
- } catch (Exception e) {
+ } catch (CoreException e) {
return false;
}
return true;
@@ -162,7 +162,7 @@
try {
s = ModelPlugin.getWorkspace().getRoot().getPersistentProperty(getPropertyName());
if(s != null) parseExternalResources(s);
- } catch (Exception e) {
+ } catch (CoreException e) {
//ignore
}
}
@@ -192,7 +192,7 @@
}
try {
ModelPlugin.getWorkspace().getRoot().setPersistentProperty(getPropertyName(), sb.toString());
- } catch (Exception e) {
+ } catch (CoreException e) {
//ignore
}
}
@@ -248,7 +248,6 @@
}
private boolean setDeclaredResources(IPath path, ResourceReference[] entries, int scope, int depth) {
- try {
String oldValue = (String)getAllExternalResources().get(path.toString());
if(oldValue == null) oldValue = "";
String newValue = encodeDeclaredResources(entries, scope, depth);
@@ -258,9 +257,6 @@
} else {
getAllExternalResources().put(path.toString(), newValue);
}
- } catch (Exception e) {
- return false;
- }
return true;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -90,14 +90,10 @@
}
public Point getPreferredSize() {
- try {
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- String os_name = System.getProperty("os.name");
- if(os_name != null && os_name.indexOf("Windows") >= 0) return new Point(800, 600);
- } catch (Exception e) {
- //ignore
- }
+ //changed by estherbin
+ //http://jira.jboss.com/jira/browse/JBIDE-2010
+ String os_name = System.getProperty("os.name");
+ if(os_name != null && os_name.indexOf("Windows") >= 0) return new Point(800, 600);
//changed by estherbin
//http://jira.jboss.com/jira/browse/JBIDE-2010
return new Point(700, 600);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/xpl/DragNodeCommand2.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/xpl/DragNodeCommand2.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/xpl/DragNodeCommand2.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -78,28 +78,20 @@
if (parentNode.getNodeType() == Node.ELEMENT_NODE && sourceAttributeOwnerElement != parentNode) {
result = true;
if (!testOnly) {
- try {
- if(getOperation() == DND.DROP_MOVE) {
- Element targetElement = (Element) parentNode;
- sourceAttributeOwnerElement.removeAttributeNode(sourceAttribute);
- targetElement.getAttributes().setNamedItem(sourceAttribute);
- fSelections.add(sourceAttribute);
- }
- else if (getOperation() == DND.DROP_COPY) {
- Attr cloneAttribute = (Attr) sourceAttribute.cloneNode(false);
- Element targetElement = (Element) parentNode;
- targetElement.getAttributes().setNamedItem(cloneAttribute);
- fSelections.add(cloneAttribute);
- }
+
+ if(getOperation() == DND.DROP_MOVE) {
+ Element targetElement = (Element) parentNode;
+ sourceAttributeOwnerElement.removeAttributeNode(sourceAttribute);
+ targetElement.getAttributes().setNamedItem(sourceAttribute);
+ fSelections.add(sourceAttribute);
}
- catch (Exception e) {
- ResourcesPlugin.getPlugin().getLog()
- .log(new Status(IStatus.ERROR,
- "org.jboss.tools.vpe",
- 0,
- e.getMessage(),
- e));
+ else if (getOperation() == DND.DROP_COPY) {
+ Attr cloneAttribute = (Attr) sourceAttribute.cloneNode(false);
+ Element targetElement = (Element) parentNode;
+ targetElement.getAttributes().setNamedItem(cloneAttribute);
+ fSelections.add(cloneAttribute);
}
+
}
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -414,53 +414,40 @@
}
public void fillContextMenu(IMenuManager menuManager, ISelection selection) {
- try {
- List selectionList = new ArrayList();
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection es = (IStructuredSelection) selection;
- for (Iterator i = es.iterator(); i.hasNext();) {
- selectionList.add(i.next());
- }
+ List selectionList = new ArrayList();
+ if (selection instanceof IStructuredSelection) {
+ IStructuredSelection es = (IStructuredSelection) selection;
+ for (Iterator i = es.iterator(); i.hasNext();) {
+ selectionList.add(i.next());
}
-
- contributeActions(menuManager, selectionList);
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
}
+ contributeActions(menuManager, selectionList);
}
public void fillContextMenuForVpe(IMenuManager menuManager,
- ISelection selection) {
- try {
- List selectionList = new ArrayList();
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection es = (IStructuredSelection) selection;
- for (Iterator i = es.iterator(); i.hasNext();) {
- selectionList.add(i.next());
- }
+ ISelection selection) {
+ List selectionList = new ArrayList();
+ if (selection instanceof IStructuredSelection) {
+ IStructuredSelection es = (IStructuredSelection) selection;
+ for (Iterator i = es.iterator(); i.hasNext();) {
+ selectionList.add(i.next());
}
-
- contributeActionsForVpe(menuManager, selectionList);
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
}
+
+ contributeActionsForVpe(menuManager, selectionList);
}
public void addContextMenuForVpe(IMenuManager menuManager,
ISelection selection) {
- try {
- List selectionList = new ArrayList();
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection es = (IStructuredSelection) selection;
- for (Iterator i = es.iterator(); i.hasNext();) {
- selectionList.add(i.next());
- }
+ List selectionList = new ArrayList();
+ if (selection instanceof IStructuredSelection) {
+ IStructuredSelection es = (IStructuredSelection) selection;
+ for (Iterator i = es.iterator(); i.hasNext();) {
+ selectionList.add(i.next());
}
-
- contributeDeleteActionForVpe(menuManager, selectionList);
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
}
+
+ contributeDeleteActionForVpe(menuManager, selectionList);
}
public void remove(Node parent, int startIndex, int endIndex) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -60,6 +60,7 @@
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.xulrunner.XPCOM;
+import org.jboss.tools.vpe.xulrunner.XulRunnerException;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -287,7 +288,7 @@
}
xulRunnerEditor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
}
- catch (Exception e) {
+ catch (XulRunnerException e) {
VpePlugin.getPluginLog().logError(e);
layout.verticalSpacing = 10;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -38,6 +38,7 @@
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
import org.jboss.tools.vpe.messages.VpeUIMessages;
+import org.jboss.tools.vpe.xulrunner.XulRunnerException;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
/**
@@ -94,7 +95,7 @@
getXulRunnerEditor().setText(DocTypeUtil.prepareInitFile(INIT_URL,
getEditorInput()));
getXulRunnerEditor().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- } catch (Exception e) {
+ } catch (XulRunnerException e) {
Label title = new Label(parent, SWT.WRAP);
title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR);
title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelectionBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelectionBuilder.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelectionBuilder.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -68,24 +68,20 @@
if (focusNode instanceof IDOMElement) {
IDOMElement element = (IDOMElement)focusNode;
if (focusPosition < element.getEndStartOffset()) {
- try {
- NamedNodeMap attrs = focusNode.getAttributes();
- for (int i = 0; i < attrs.getLength(); i++) {
- AttrImpl attr = (AttrImpl)attrs.item(i);
- ITextRegion region = attr.getValueRegion();
- if(region==null) {
- break;
- }
- int attrStart = region.getStart();
- int attrEnd = attrStart + attr.getValue().length();
- if (range.x - ((ElementImpl)attr.getOwnerElement()).getStartOffset() - 1 >= attrStart && range.x - ((ElementImpl)attr.getOwnerElement()).getStartOffset() - 1 <= attrEnd) {
- selectedNodes = new ArrayList();
- selectedNodes.add(attr);
- break;
- }
+ NamedNodeMap attrs = focusNode.getAttributes();
+ for (int i = 0; i < attrs.getLength(); i++) {
+ AttrImpl attr = (AttrImpl)attrs.item(i);
+ ITextRegion region = attr.getValueRegion();
+ if(region==null) {
+ break;
}
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
+ int attrStart = region.getStart();
+ int attrEnd = attrStart + attr.getValue().length();
+ if (range.x - ((ElementImpl)attr.getOwnerElement()).getStartOffset() - 1 >= attrStart && range.x - ((ElementImpl)attr.getOwnerElement()).getStartOffset() - 1 <= attrEnd) {
+ selectedNodes = new ArrayList();
+ selectedNodes.add(attr);
+ break;
+ }
}
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -480,8 +480,6 @@
.getDocument(), getRegionToFormat());
}
}
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
} finally {
clearRegionToFormat();
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -10,7 +10,11 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.template;
+import java.io.IOException;
+
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.ui.IEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
@@ -76,8 +80,10 @@
if (file != null && file.exists()) {
try {
return (IDOMModel)StructuredModelManager.getModelManager().getModelForRead(file);
- } catch(Exception ex) {
+ } catch(IOException ex) {
VpePlugin.reportProblem(ex);
+ } catch(CoreException ex) {
+ VpePlugin.reportProblem(ex);
}
}
return null;
@@ -114,24 +120,23 @@
}
IEditorInput input = pageContext.getEditPart().getEditorInput();
IFile file = null;
- try {
- if(pageContext.getVisualBuilder().getCurrentIncludeInfo()==null) {
- file = FileUtil.getFile(input, fileName);
- } else {
- IFile includedFile =
- pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
- file = FileUtil.getFile(fileName, includedFile);
- }
- } catch (Exception e) {
- // nothing
+
+ if(pageContext.getVisualBuilder().getCurrentIncludeInfo()==null) {
+ file = FileUtil.getFile(input, fileName);
+ } else {
+ IFile includedFile =
+ pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
+ file = FileUtil.getFile(fileName, includedFile);
}
if (file != null) {
if (!file.isSynchronized(0)){
try {
file.refreshLocal(0, null);
- } catch (Exception ex) {
+ } catch (CoreException ex) {
VpePlugin.getPluginLog().logError(ex);
+ } catch (OperationCanceledException ex) {
+ VpePlugin.getPluginLog().logError(ex);
}
}
if (file.exists()) {
@@ -146,8 +151,10 @@
try {
wtpModel = (IDOMModel)StructuredModelManager.getModelManager().getModelForRead(file);
if (wtpModel != null) return wtpModel.getDocument();
- } catch(Exception e) {
+ } catch(IOException e) {
VpePlugin.getPluginLog().logError(e);
+ } catch(CoreException e) {
+ VpePlugin.getPluginLog().logError(e);
}
return null;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -628,12 +628,9 @@
private VisualDataTableElements getVisualDataTableElements(Map visualNodeMap) {
if (visualNodeMap != null) {
Object o = visualNodeMap.get(this);
- try {
- if (o != null && o instanceof Object[]
- && ((Object[]) o)[0] instanceof VisualDataTableElements) {
- return (VisualDataTableElements) ((Object[]) o)[0];
- }
- } catch (Exception e) {
+ if (o != null && o instanceof Object[]
+ && ((Object[]) o)[0] instanceof VisualDataTableElements) {
+ return (VisualDataTableElements) ((Object[]) o)[0];
}
}
return null;
@@ -642,12 +639,9 @@
private SourceDataTableElements getSourceDataTableElements(Map visualNodeMap) {
if (visualNodeMap != null) {
Object o = visualNodeMap.get(this);
- try {
- if (o != null && o instanceof Object[]
- && ((Object[]) o)[1] instanceof SourceDataTableElements) {
- return (SourceDataTableElements) ((Object[]) o)[1];
- }
- } catch (Exception e) {
+ if (o != null && o instanceof Object[]
+ && ((Object[]) o)[1] instanceof SourceDataTableElements) {
+ return (SourceDataTableElements) ((Object[]) o)[1];
}
}
return null;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -102,11 +102,11 @@
if (vpeValue != null) {
String strValue = vpeValue.stringValue();
try {
- int val = Integer.valueOf(strValue).intValue();
+ int val = Integer.parseInt(strValue);
if (val > 0) {
tableSize = val;
}
- } catch (Exception e) {
+ } catch (NumberFormatException e) {
VpePlugin.getPluginLog().logError(e);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -351,9 +351,6 @@
String locale = jsfCoreViewTag.getAttribute(LOCALE_ATTRNAME);
if (locale == null || locale.length() == 0) return null;
return locale;
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
- return null;
} finally {
if (model != null) model.releaseFromRead();
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -195,11 +195,11 @@
if (vpeValue != null) {
String strValue = vpeValue.stringValue();
try {
- int val = Integer.valueOf(strValue).intValue();
+ int val = Integer.parseInt(strValue);
if (val > 0) {
tableSize = val;
}
- } catch (Exception e) {
+ } catch (NumberFormatException e) {
}
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -10,14 +10,22 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.template;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.jboss.tools.vpe.VpePlugin;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder;
+import org.jboss.tools.vpe.editor.util.FileUtil;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -25,13 +33,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.jboss.tools.vpe.VpePlugin;
-import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder;
-import org.jboss.tools.vpe.editor.util.FileUtil;
-import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-
public class VpePanelLayoutCreator extends VpeAbstractCreator {
@@ -268,8 +269,10 @@
if(wtpModel != null){
init(wtpModel.getDocument(), node);
}
- }catch(Exception ex){
+ } catch(IOException ex) {
VpePlugin.reportProblem(ex);
+ } catch(CoreException ex) {
+ VpePlugin.reportProblem(ex);
} finally {
if(wtpModel!=null)
wtpModel.releaseFromRead();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFile.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFile.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFile.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.editor.template;
import java.io.File;
+import java.io.IOException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IPath;
@@ -20,19 +21,16 @@
long stamp;
IConfigurationElement configElement;
- VpeTemplateFile(String fileName,IConfigurationElement element) throws Exception {
+ VpeTemplateFile(String fileName,IConfigurationElement element) throws IOException {
this(element);
path = VpeTemplateFileList.getFilePath(fileName,element);
File file = path.toFile();
if (file.exists() && file.isFile()) {
stamp = file.lastModified();
- } else {
- throw new Exception("File " + path.toOSString() + " not exist");
- }
+ }
}
- VpeTemplateFile(IConfigurationElement element) throws Exception {
-
+ VpeTemplateFile(IConfigurationElement element) {
configElement = element;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -39,8 +39,8 @@
VpeTemplateFile newAutoTemplateFile = null;
try {
newAutoTemplateFile = new VpeTemplateFile(VpeTemplateManager.AUTO_TEMPLATES_FILE_NAME, null);
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError(e);
+ } catch (IOException e) {
+ VpePlugin.getPluginLog().logError("Default template for unknown tags loading error ",e);
}
changed = (autoTemplateFile == null) != (newAutoTemplateFile == null);
if (!changed && autoTemplateFile != null) {
@@ -93,8 +93,8 @@
try {
VpeTemplateFile templateFile = new VpeTemplateFile(pathAttrValue, elements[j]);
templateList.add(templateFile);
- } catch (Exception e) {
- VpePlugin.reportProblem(e);
+ } catch (IOException e) {
+ VpePlugin.getPluginLog().logError("Error during loading template '" + pathAttrValue + "'", e);
}
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -688,7 +688,7 @@
}
}
- private Element createNewTagElement(Document document, VpeAnyData data) {
+ static public Element createNewTagElement(Document document, VpeAnyData data) {
Element newTagElement = document.createElement(TAG_TAG);
newTagElement.setAttribute(ATTR_TAG_NAME, data.getName());
newTagElement.setAttribute(ATTR_TAG_CASE_SENSITIVE, data.isCaseSensitive() ? ATTR_VALUE_YES : ATTR_VALUE_NO);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -28,16 +28,7 @@
public VpeValue exec(VpePageContext pageContext, Node sourceNode) {
String value = null;
-
- try {
- value = ((Element)sourceNode).getAttribute(name);
- if (value == null) {
- value = "";
- }
- } catch (Exception e) {
-// throw new VpeExpressionError(x.getMessage());
- VpePlugin.getPluginLog().logError(e);
- }
+ value = ((Element)sourceNode).getAttribute(name);
return new VpeValue((value == null ? "" : value));
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionFactory.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -44,10 +44,12 @@
}
try {
return (VpeFunction)cls.newInstance();
- } catch(Exception e) {
+ } catch(IllegalAccessException e) {
VpePlugin.getPluginLog().logError(e);
- return null;
+ } catch (InstantiationException e) {
+ VpePlugin.getPluginLog().logError(e);
}
+ return null;
}
private static Class<?> createCls(String name) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -24,6 +24,7 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.jboss.tools.common.kb.AttributeDescriptor;
import org.jboss.tools.common.kb.AttributeValueDescriptor;
+import org.jboss.tools.common.kb.KbException;
import org.jboss.tools.common.kb.ParamList;
import org.jboss.tools.common.kb.wtp.WtpKbConnector;
import org.jboss.tools.common.model.XModel;
@@ -224,7 +225,7 @@
tagValue = tagValue.substring(vs[0].length());
}
}
- } catch (Exception e) {
+ } catch (KbException e) {
VpePlugin.getPluginLog().logError(e);
}
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 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -71,63 +71,58 @@
public VpeValue exec(VpePageContext pageContext, Node sourceNode) {
//gets function parameter
- try {
- String tagValue = getParameter(0).exec(pageContext, sourceNode)
- .stringValue();
-
- double startValue = getStartVersion(tagValue);
-
- double endValue = getEndVersion(tagValue);
-
- if(sourceNode==null || sourceNode.getPrefix()==null) {
-
- return new VpeValue(false);
- }
-
- List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,pageContext);
-
- TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourceNode.getPrefix(), taglibs);
- //this function works only for jsp files
- String tldVersion = TLDVersionHelper.getTldVersion(sourceNodeTaglib.getUri(), sourceNodeTaglib.getPrefix(),
- pageContext.getSourceBuilder().getStructuredTextViewer().getDocument());
-
- double tldVersionNumber =0;
- if(tldVersion!=null) {
+
+ String tagValue = getParameter(0).exec(pageContext, sourceNode)
+ .stringValue();
- tldVersionNumber = Double.parseDouble(tldVersion);
-
- } else {
- //here we getting tld version for xhtml files
- XModel xm = null;
- IProject project = ((IFileEditorInput)pageContext.getEditPart().getEditorInput()).getFile().getProject();
- IModelNature mn = EclipseResourceUtil.getModelNature(project);
- if(mn!=null) {
- xm = mn.getModel();
+ double startValue = getStartVersion(tagValue);
+
+ double endValue = getEndVersion(tagValue);
+
+ if(sourceNode==null || sourceNode.getPrefix()==null) {
+
+ return new VpeValue(false);
}
- tldVersion=WebProject.getTldVersion(sourceNodeTaglib.getUri(),
- sourceNodeTaglib.getPrefix(),
- pageContext.getSourceBuilder().getStructuredTextViewer().getDocument(),
- xm);
- if(tldVersion!=null) {
+ List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,pageContext);
+
+ TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourceNode.getPrefix(), taglibs);
+ //this function works only for jsp files
+ String tldVersion = TLDVersionHelper.getTldVersion(sourceNodeTaglib.getUri(), sourceNodeTaglib.getPrefix(),
+ pageContext.getSourceBuilder().getStructuredTextViewer().getDocument());
+
+ double tldVersionNumber =0;
+ if(tldVersion!=null) {
+
tldVersionNumber = Double.parseDouble(tldVersion);
+
} else {
- tldVersionNumber = 0;
+ //here we getting tld version for xhtml files
+ XModel xm = null;
+ IProject project = ((IFileEditorInput)pageContext.getEditPart().getEditorInput()).getFile().getProject();
+ IModelNature mn = EclipseResourceUtil.getModelNature(project);
+ if(mn!=null) {
+ xm = mn.getModel();
+ }
+ tldVersion=WebProject.getTldVersion(sourceNodeTaglib.getUri(),
+ sourceNodeTaglib.getPrefix(),
+ pageContext.getSourceBuilder().getStructuredTextViewer().getDocument(),
+ xm);
+ if(tldVersion!=null) {
+
+ tldVersionNumber = Double.parseDouble(tldVersion);
+ } else {
+ tldVersionNumber = 0;
+ }
}
- }
- if((startValue<=tldVersionNumber)&&
- (endValue>=tldVersionNumber)) {
-
- return new VpeValue(true);
- } else {
+ if((startValue<=tldVersionNumber)&&
+ (endValue>=tldVersionNumber)) {
+
+ return new VpeValue(true);
+ } else {
+ return new VpeValue(false);
+ }
- return new VpeValue(false);
- }
- }catch (Exception e) {
- //if this function throws exception templates are not working more, so we should processed it's here
- VpePlugin.getPluginLog().logError(e);
- }
- return null;
}
private double getStartVersion(String tagValue) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -16,6 +16,7 @@
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.template.expression.VpeExpression;
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException;
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo;
import org.jboss.tools.vpe.editor.template.expression.VpeValue;
import org.jboss.tools.vpe.editor.util.SourceDomUtil;
@@ -135,7 +136,7 @@
}else{
resizeData = resizeData.getNext();
}
- }catch(Exception ex){
+ }catch(VpeExpressionBuilderException ex){
VpePlugin.reportProblem(ex);
resizeData = resizeData.getNext();
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -15,6 +15,7 @@
import java.util.List;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
import org.eclipse.wst.xml.core.internal.document.TextImpl;
@@ -89,7 +90,7 @@
return;
}
currentSelectedTagValue = newSelectedTagValue;
- } catch (Exception e) {
+ } catch (BadLocationException e) {
VpePlugin.getPluginLog().logError(e);
}
} else {
@@ -163,7 +164,6 @@
private TextFormatingData getParentFormatingDataForTextNode(VpeSelectedNodeInfo selectedNodeInfo) {
Node selectedNode = selectedNodeInfo.getNode();
if(selectedNode instanceof TextImpl) {
- try {
// int startOffset = selectedNodeInfo.getStartOffset()>selectedNodeInfo.getEndOffset()?selectedNodeInfo.getEndOffset():selectedNodeInfo.getStartOffset();
// int endOffset = selectedNodeInfo.getStartOffset()>selectedNodeInfo.getEndOffset()?selectedNodeInfo.getStartOffset():selectedNodeInfo.getEndOffset();
//
@@ -182,11 +182,6 @@
// }
currentSelectedElement = selectedNode.getParentNode();
return getFormatTemplateForTag(selectedNode.getParentNode());
- } catch(Exception e) {
- Status status = new Status(Status.WARNING, VpePlugin.PLUGIN_ID, Status.ERROR, "Can't get value of selected text node.", e);
- ProblemReportingHelper.reportProblem(status);
- VpePlugin.getDefault().getLog().log(status);
- }
}
return null;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -104,7 +104,7 @@
String[] font = null;
try {
font = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
- } catch (Exception ex) {
+ } catch (Error ex) {
VpePlugin.getPluginLog().logWarning(ex);
font = FONT_ARRAY;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.TextSelection;
@@ -171,7 +172,7 @@
}
try {
document.replace(element.getStartOffset(), length, body);
- } catch (Exception e) {
+ } catch (BadLocationException e) {
VpePlugin.getPluginLog().logError("Can't format text", e);
}
@@ -214,7 +215,7 @@
}
try {
document.replace(element.getStartOffset(), length, newElement);
- } catch (Exception e) {
+ } catch (BadLocationException e) {
VpePlugin.getPluginLog().logError("Can't format text", e);
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandlerLoadingException.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandlerLoadingException.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandlerLoadingException.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -0,0 +1,18 @@
+
+package org.jboss.tools.vpe.editor.toolbar.format.handler;
+
+public class FormatHandlerLoadingException extends Exception {
+
+ public FormatHandlerLoadingException(String message) {
+ super(message);
+ }
+
+ public FormatHandlerLoadingException(Throwable cause) {
+ super(cause);
+ }
+
+ public FormatHandlerLoadingException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandlerLoadingException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/HandlerFactory.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -57,10 +57,14 @@
return handler;
} else {
VpePlugin.getPluginLog().logError("Wrong format handler. Class - " + handlerClassName + ". Handler must be instance of org.jboss.tools.vpe.editor.toolbar.format.handler.IFormatHandler", //$NON-NLS-1$//$NON-NLS-2$
- new Exception("Handler must be instance of org.jboss.tools.vpe.editor.toolbar.format.handler.IFormatHandler")); //$NON-NLS-1$
+ new FormatHandlerLoadingException("Handler must be instance of org.jboss.tools.vpe.editor.toolbar.format.handler.IFormatHandler")); //$NON-NLS-1$
}
- } catch (Exception e) {
- VpePlugin.getPluginLog().logError("Can't create format handler. Class: " + handlerClassName, e); //$NON-NLS-1$
+ } catch (IllegalAccessException e) {
+ reportException(e,handlerClassName);
+ } catch (InstantiationException e) {
+ reportException(e,handlerClassName);
+ } catch (ClassNotFoundException e) {
+ reportException(e,handlerClassName);
}
}
return null;
@@ -84,4 +88,8 @@
public int getCountHandlers() {
return handlers.size();
}
+
+ private void reportException(Exception e, String handlerClassName) {
+ VpePlugin.getPluginLog().logError("Can't create format handler. Class: " + handlerClassName, e); //$NON-NLS-1$
+ }
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -14,6 +14,7 @@
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.viewers.ISelectionProvider;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.ui.dnd.DnDUtil;
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
@@ -33,12 +34,12 @@
properties.put("selectionProvider", provider);
properties.put("viewer", viewer);
- try {
- DnDUtil.paste(input.getXModelObject(), properties);
- PaletteInsertHelper.insertIntoEditor(viewer, properties);
- } catch (Exception ex) {
- VpePlugin.getPluginLog().logError(ex);
- }
+ try {
+ DnDUtil.paste(input.getXModelObject(), properties);
+ PaletteInsertHelper.insertIntoEditor(viewer, properties);
+ } catch (XModelException ex) {
+ VpePlugin.getPluginLog().logError(ex);
+ }
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.editor.util;
import java.io.FileInputStream;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +46,7 @@
} finally {
try {
if (inStream != null) inStream.close();
- } catch (Exception e) {
+ } catch (IOException e) {
VpePlugin.getPluginLog().logError(e);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java 2008-07-23 20:59:03 UTC (rev 9253)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java 2008-07-23 21:47:32 UTC (rev 9254)
@@ -134,7 +134,7 @@
sash.setWeights(weights);
}
}
- } catch (Exception e) {
+ } catch (NumberFormatException e) {
// Do nothing
}
}
More information about the jbosstools-commits
mailing list