[jbosstools-commits] JBoss Tools SVN: r7019 - in trunk/jst/plugins: org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist and 22 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Mar 19 13:38:32 EDT 2008
Author: dazarov
Date: 2008-03-19 13:38:31 -0400 (Wed, 19 Mar 2008)
New Revision: 7019
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPEditorMessages.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.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/JSPPropertySourceAdapter.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/FaceletsJsfCResource.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMessagesVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EvaluatedVariable.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/FilteredVariablesEnumeration.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletResponseVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StackFrameWrapper.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StrutsData.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxyFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataView.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/xpl/WebDebugUIPlugin.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.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/TilesEditor.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/TilesCompoundCommand.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/editors/TLDEditorMessages.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/AddProjectTemplateResourcesView.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.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebWarContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.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/project/version/ProjectVersions.java
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/tld/model/handlers/JSPAdopt.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-894
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -52,6 +52,7 @@
try {
resourceBundle= ResourceBundle.getBundle("org.jboss.tools.jst.jsp.JspEditorPluginResources");
} catch (MissingResourceException x) {
+ getPluginLog().logError(x);
resourceBundle = null;
}
}
@@ -73,6 +74,7 @@
try {
return bundle.getString(key);
} catch (MissingResourceException e) {
+ getPluginLog().logError(e);
return key;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -401,7 +401,7 @@
try {
ad = getWtpKbConnector().getAttributeInformation(query);
} catch(Exception e) {
- ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, "ERROR: Can't get Attribute Descriptor from KB by " + query + "", e);
+ JspEditorPlugin.getPluginLog().logError(e);
}
if(ad!=null) {
CMAttributeDeclaration attrDecl = null;
@@ -484,7 +484,7 @@
FaceletsJsfCResource fsfCResource = new FaceletsJsfCResource(wtpKbConnector);
wtpKbConnector.registerResource(fsfCResource);
} catch(Exception e) {
- ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, "ERROR: Can't create WtpKbConnector.", e);
+ JspEditorPlugin.getPluginLog().logError(e);
}
}
return wtpKbConnector;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -13,6 +13,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
+
public class TreeViewerMessages {
private static final String RESOURCE_BUNDLE = "org.jboss.tools.jst.jsp.drop.treeviewer.ui.TreeViewerMessages";
@@ -23,6 +25,7 @@
try {
return resourceBundle.getString(key);
} catch (MissingResourceException e) {
+ JspEditorPlugin.getPluginLog().logError(e);
return "%" + key + "%";
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPEditorMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPEditorMessages.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPEditorMessages.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -12,6 +12,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
+
/**
* @author Jeremy
*
@@ -30,6 +32,7 @@
try {
return fgResourceBundle.getString(key);
} catch (MissingResourceException e) {
+ JspEditorPlugin.getPluginLog().logError(e);
return "!!!" + key + "!!!";//$NON-NLS-2$ //$NON-NLS-1$
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -165,6 +165,7 @@
}
} catch (Exception e) {
+ JspEditorPlugin.getPluginLog().logError(e);
selectedPageIndex = 0;
}
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -333,6 +333,7 @@
if (c < 0)
c = 0;
} catch (Exception ex) {
+ JspEditorPlugin.getPluginLog().logError(ex);
c = t.getOffsetAtLine(lineIndex + 1)
- (t.getLineDelimiter() == null ? 0
: t.getLineDelimiter()
@@ -341,6 +342,7 @@
return c;
}
} catch (Exception e) {
+ JspEditorPlugin.getPluginLog().logError(e);
return 0;
}
}
@@ -866,6 +868,7 @@
if (c < 0)
c = 0;
} catch (Exception ex) {
+ JspEditorPlugin.getPluginLog().logError(ex);
c = t.getOffsetAtLine(lineIndex + 1)
- (t.getLineDelimiter() == null ? 0 : t
.getLineDelimiter().length());
@@ -873,6 +876,7 @@
return c;
}
} catch (Exception e) {
+ JspEditorPlugin.getPluginLog().logError(e);
return 0;
}
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -576,9 +576,7 @@
}
}
catch (DOMException e) {
- Display d = PlatformUI.getWorkbench().getDisplay();
- if (d != null)
- d.beep();
+ JspEditorPlugin.getPluginLog().logError(e);
}
fValuesBeingSet.pop();
}
@@ -677,9 +675,7 @@
attrMap.removeNamedItem(propertyObject.toString());
}
catch (DOMException e) {
- if (e.code != DOMException.INVALID_MODIFICATION_ERR) {
-/// Logger.logException(e);
- }
+ JspEditorPlugin.getPluginLog().logError(e);
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/FaceletsJsfCResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/FaceletsJsfCResource.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/FaceletsJsfCResource.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -84,7 +84,7 @@
}
}
} catch (KbException e) {
- ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, "ERROR: Can't process query: " + query, e);
+ JspEditorPlugin.getPluginLog().logError(e);
}
return proposalsWithoutHtmlTags;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbAbstractModelResource.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -20,6 +20,7 @@
import org.jboss.tools.common.kb.KbDinamicResource;
import org.jboss.tools.common.kb.KbProposal;
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
public abstract class WTPKbAbstractModelResource implements KbDinamicResource {
@@ -40,6 +41,7 @@
}
fXModel = (fXModelObject == null) ? null : fXModelObject.getModel();
} catch (Exception x) {
+ JspEditorPlugin.getPluginLog().logError(x);
this.fProvider = null;
this.fXModel = null;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -80,6 +80,7 @@
try {
loadWebXML(body, location);
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
webXMLErrorMessage = e.getMessage();
return;
}
@@ -87,6 +88,7 @@
try {
webInfLocation = webInfFile.getCanonicalPath().replace('\\', '/');
} catch (IOException e) {
+ WebModelPlugin.getPluginLog().logError(e);
webXMLErrorMessage = e.getMessage();
return;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -26,6 +26,7 @@
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
@@ -225,6 +226,7 @@
long last = f.isFile() ? f.lastModified() : -1;
return webXMLTimeStamp == last;
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
return webXMLTimeStamp == -1;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebWarContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebWarContext.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebWarContext.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -30,6 +30,7 @@
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.WebModuleImpl;
@@ -74,6 +75,7 @@
zip = new ZipFile(f);
loadEntries();
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
warError = NLS.bind(WebUIMessages.FILE_ISNOT_CORRECT,location);
return;
}
@@ -92,12 +94,14 @@
InputStream s = zip.getInputStream(entry);
body = FileUtil.readStream(s);
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
warError = NLS.bind(WebUIMessages.CANNOT_READ_WEBXML, location); //$NON-NLS-2$
return;
}
try {
loadWebXML(body, "WEB-INF/web.xml"); //$NON-NLS-1$
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
warError = e.getMessage();
return;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/RegisterServerContext.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -22,6 +22,7 @@
import org.eclipse.wst.server.core.internal.*;
import org.jboss.tools.common.model.options.Preference;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.server.RegistrationHelper;
import org.jboss.tools.jst.web.server.ServerManager;
@@ -194,6 +195,7 @@
try {
Integer.parseInt(t);
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
return false;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/WebProcessStructureHelper.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -95,6 +95,7 @@
try {
result[i] = Integer.parseInt(s[i]);
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
result[i] = 0;
}
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/helpers/autolayout/LayuotConstants.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -10,8 +10,10 @@
******************************************************************************/
package org.jboss.tools.jst.web.model.helpers.autolayout;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.model.options.*;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.options.PreferenceModelUtilities;
+import org.jboss.tools.jst.web.WebModelPlugin;
public class LayuotConstants {
static int DELTA_X = 200;
@@ -62,6 +64,7 @@
incY = Y_INC;
}
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
deltaX = DELTA_X;
deltaY = DELTA_Y;
incX = X_INC;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -42,6 +42,7 @@
try {
return new File(path).getCanonicalPath().replace('\\', '/');
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
return path;
}
}
@@ -66,6 +67,7 @@
errorMessage = (errors == null || errors.length == 0) ? WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE + file.getAbsolutePath()
: WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE + file.getAbsolutePath() + ":\n" + errors[0]; //$NON-NLS-2$
} catch (Exception exc) {
+ WebModelPlugin.getPluginLog().logError(exc);
errorMessage = WebUIMessages.CANNOT_READ_PROJECT_VERSIONS_DESCRIPTORFILE + file.getAbsolutePath();
}
} else {
@@ -101,6 +103,7 @@
try {
return f.getCanonicalPath().replace('\\', '/');
} catch (Exception e) {
+ WebModelPlugin.getPluginLog().logError(e);
return f.getAbsolutePath().replace('\\', '/');
}
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -95,6 +95,7 @@
try {
server.getRootModules(m, null);
} catch (CoreException ce) {
+ WebModelPlugin.getPluginLog().logError(ce);
return ce.getStatus().getMessage();
}
@@ -104,7 +105,7 @@
if(status != null && !status.isOK()) return status.getMessage();
return null;
} catch (Exception e) {
- //ignore
+ WebModelPlugin.getPluginLog().logError(e);
return WebUIMessages.CANNOT_REGISTER_IN_THIS_SERVER;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/handlers/JSPAdopt.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -13,6 +13,7 @@
import java.util.*;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.meta.*;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.tld.URIConstants;
import org.jboss.tools.jst.web.tld.model.*;
import org.jboss.tools.jst.web.tld.model.helpers.*;
@@ -72,7 +73,7 @@
try {
c = Integer.parseInt(p.getProperty("pos"));
} catch (Exception e) {
- // Ignore
+ WebModelPlugin.getPluginLog().logError(e);
}
if(c < 0) return;
String text = p.getProperty("text");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/DebugMessages.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -27,6 +27,7 @@
try {
return resourceBundle.getString(key);
} catch (MissingResourceException e) {
+ WebDebugPlugin.getPluginLog().logError(e);
return "%"+key+"%";
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug/src/org/jboss/tools/jst/web/debug/xpl/EvaluationSupport.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -81,7 +81,7 @@
try {
Thread.sleep(100);
} catch (Exception x) {
- // Ignore
+ WebDebugPlugin.getPluginLog().logError(x);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -94,7 +94,7 @@
}
return (value == null ? false : value.booleanValue());
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
return false;
}
}
@@ -110,7 +110,7 @@
}
return (value == null ? "" : value);
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
return "";
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMessagesVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMessagesVariableProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMessagesVariableProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -104,8 +104,12 @@
JDIThread thread = (JDIThread)thisFrame.getThread();
List frames = null;
- try { frames = thread.computeNewStackFrames(); }
- catch (Exception x) { return null; }
+ try {
+ frames = thread.computeNewStackFrames();
+ }catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return null;
+ }
for (int i = 0; frames != null && i < frames.size(); i++) {
IStackFrame currentFrame = (IStackFrame)frames.get(i);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListValueProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListValueProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -42,8 +42,12 @@
if (!fOrigin.hasVariables()) return;
vars = fOrigin.getVariables();
IVariable sizeVar = EvaluationSupport.findVariableForName(vars, "size");
- try { fSize = Integer.parseInt(sizeVar.getValue().getValueString()); }
- catch (Exception ex) { fSize = 0; }
+ try {
+ fSize = Integer.parseInt(sizeVar.getValue().getValueString());
+ }catch (Exception ex) {
+ WebDebugUIPlugin.getPluginLog().logError(ex);
+ fSize = 0;
+ }
IVariable table = EvaluationSupport.findVariableForName(vars, "elementData");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EvaluatedVariable.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EvaluatedVariable.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EvaluatedVariable.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -18,6 +18,7 @@
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.debug.eval.IEvaluationResult;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
@@ -63,6 +64,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
fResult = null;
fValue = null;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/FilteredVariablesEnumeration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/FilteredVariablesEnumeration.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/FilteredVariablesEnumeration.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -72,6 +72,7 @@
return (patterns.size() == 0 ? null : patterns);
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
return null;
}
}
@@ -89,6 +90,7 @@
}
}
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
fVariables = null; // For sure
}
}
@@ -97,7 +99,10 @@
String varName = null;
try {
varName = var.getName();
- } catch (Exception x) { return false; }
+ } catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return false;
+ }
if (varName == null || varName.length() == 0) return false;
for (int i = 0; fStopPatterns != null && i < fStopPatterns.size(); i++) {
@@ -180,6 +185,7 @@
return (sequence.size() == 0 ? null : (Element[])sequence.toArray(new Element[sequence.size()]));
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
return null;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapValueProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapValueProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -78,6 +78,7 @@
fSize = 0;
}
} catch (Exception ex) {
+ WebDebugUIPlugin.getPluginLog().logError(ex);
fSize = 0;
}
return fSize;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableValueProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableValueProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -48,7 +48,10 @@
try {
fSize = Integer.parseInt(sizeVar.getValue().getValueString());
}
- catch (Exception ex) { fSize = 0; }
+ catch (Exception ex) {
+ WebDebugUIPlugin.getPluginLog().logError(ex);
+ fSize = 0;
+ }
IVariable table = EvaluationSupport.findVariableForName(vars, "table");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestVariableProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestVariableProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -113,7 +113,10 @@
JDIThread thread = (JDIThread)thisFrame.getThread();
List frames = null;
try { frames = thread.computeNewStackFrames(); }
- catch (Exception x) { return null; }
+ catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return null;
+ }
for (int i = 0; frames != null && i < frames.size(); i++) {
IStackFrame currentFrame = (IStackFrame)frames.get(i);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletResponseVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletResponseVariableProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletResponseVariableProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -116,7 +116,10 @@
JDIThread thread = (JDIThread)thisFrame.getThread();
List frames = null;
try { frames = thread.computeNewStackFrames(); }
- catch (Exception x) { return null; }
+ catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return null;
+ }
for (int i = 0; frames != null && i < frames.size(); i++) {
IStackFrame currentFrame = (IStackFrame)frames.get(i);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextVariableProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextVariableProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -115,7 +115,10 @@
JDIThread thread = (JDIThread)thisFrame.getThread();
List frames = null;
try { frames = thread.computeNewStackFrames(); }
- catch (Exception x) { return null; }
+ catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return null;
+ }
for (int i = 0; frames != null && i < frames.size(); i++) {
IStackFrame currentFrame = (IStackFrame)frames.get(i);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StackFrameWrapper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StackFrameWrapper.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StackFrameWrapper.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -58,6 +58,7 @@
try {
return frameVariables = fFrame.getVariables();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
return null;
}
} else if(frameVariables == null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StrutsData.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StrutsData.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StrutsData.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -201,6 +201,7 @@
v.getVariables();
return true;
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
return false;
}
}
@@ -290,7 +291,10 @@
JDIThread thread = (JDIThread)thisFrame.getThread();
List frames = null;
try { frames = thread.computeNewStackFrames(); }
- catch (Exception x) { return null; }
+ catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return null;
+ }
for (int i = 0; frames != null && i < frames.size(); i++) {
IStackFrame currentFrame = (IStackFrame)frames.get(i);
@@ -335,7 +339,10 @@
JDIThread thread = (JDIThread)thisFrame.getThread();
List frames = null;
try { frames = thread.computeNewStackFrames(); }
- catch (Exception x) { return null; }
+ catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return null;
+ }
for (int i = 0; frames != null && i < frames.size(); i++) {
IStackFrame currentFrame = (IStackFrame)frames.get(i);
@@ -392,7 +399,9 @@
if(thisFrame == null || thisFrame.isTerminated()) return null;
IVariable[] stackVars = null;
try { stackVars = parent.getFrameVariables(); }
- catch (Exception e) { }
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
IVariable variable = EvaluationSupport.findVariableForName(stackVars, "forward"); //$NON-NLS-1$
if (variable != null) return variable;
@@ -400,13 +409,18 @@
JDIThread thread = (JDIThread)thisFrame.getThread();
List frames = null;
try { frames = thread.computeNewStackFrames(); }
- catch (Exception x) { return null; }
+ catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ return null;
+ }
for (int i = 0; frames != null && i < frames.size(); i++) {
IStackFrame currentFrame = (IStackFrame)frames.get(i);
if (!thisFrame.equals(currentFrame)) {
try { stackVars = parent.getFrameVariables(); }
- catch (Exception e) { }
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
variable = EvaluationSupport.findVariableForName(stackVars, "forward"); //$NON-NLS-1$
if (variable != null) return variable;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxy.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxy.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -82,6 +82,7 @@
IJavaModifiers jm = ((IJavaModifiers)variable);
return jm.isStatic();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
return false;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxyFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxyFactory.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxyFactory.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -64,7 +64,12 @@
IValue proxy = value;
int arrayLength = -1;
- try { arrayLength = ((JDIValue) value).getArrayLength(); } catch (Exception e) { arrayLength = -1; }
+ try {
+ arrayLength = ((JDIValue) value).getArrayLength();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ arrayLength = -1;
+ }
try {
String type = value.getReferenceTypeName();
@@ -121,7 +126,12 @@
IValue proxy = value;
int arrayLength = -1;
- try { arrayLength = ((JDIValue) value).getArrayLength(); } catch (Exception e) { arrayLength = -1; }
+ try {
+ arrayLength = ((JDIValue) value).getArrayLength();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ arrayLength = -1;
+ }
try {
String type = value.getReferenceTypeName();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataView.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataView.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataView.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -811,6 +811,7 @@
try {
svc = mp.newDetailsViewerConfiguration();
} catch (CoreException e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
DebugUIPlugin
.errorDialog(
getSite().getShell(),
@@ -950,7 +951,7 @@
// return variablesViewer;
return null;
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
return null;
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/xpl/WebDebugUIPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/xpl/WebDebugUIPlugin.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/xpl/WebDebugUIPlugin.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -47,7 +47,7 @@
try {
return getResourceBundle().getString(key);
} catch (MissingResourceException e) {
- //ignore
+ getPluginLog().logError(e);
return key;
}
}
@@ -60,7 +60,7 @@
try {
resourceBundle= ResourceBundle.getBundle("org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIResources");
} catch (Exception x) {
- //ignore
+ getPluginLog().logError(x);
resourceBundle = null;
}
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -10,18 +10,28 @@
******************************************************************************/
package org.jboss.tools.jst.web.tiles.model;
-import java.io.*;
+import java.io.StringReader;
+import java.io.StringWriter;
-import org.w3c.dom.*;
-
-import org.jboss.tools.common.meta.*;
+import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.filesystems.FileAuxiliary;
-import org.jboss.tools.common.model.filesystems.impl.*;
+import org.jboss.tools.common.model.filesystems.impl.AbstractExtendedXMLFileImpl;
+import org.jboss.tools.common.model.filesystems.impl.AbstractXMLFileImpl;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.filesystems.impl.FolderLoader;
import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader;
-import org.jboss.tools.common.model.util.*;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.util.EntityXMLRegistration;
+import org.jboss.tools.common.model.util.XMLUtil;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.jst.web.model.WebProcessLoader;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class FileTilesLoader implements WebProcessLoader, TilesConstants {
private FileAuxiliary aux = new FileAuxiliary("l4t", false);
@@ -143,6 +153,7 @@
aux.write(object.getParent(), object, process);
return true;
} catch (Exception exc) {
+ ModelPlugin.getPluginLog().logError(exc);
return false;
}
}
@@ -161,6 +172,7 @@
util.saveChildren(element, object);
return SimpleWebFileLoader.serialize(element, object);
} catch (Exception e) {
+ ModelPlugin.getPluginLog().logError(e);
return null;
}
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesRecognizer.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -12,6 +12,7 @@
import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.common.model.loaders.*;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.xml.XMLEntityResolver;
public class FileTilesRecognizer implements EntityRecognizer {
@@ -19,7 +20,7 @@
try {
XMLEntityResolver.registerPublicEntity(TilesConstants.DOC_PUBLICID, FileTilesRecognizer.class, "/meta/tiles_config_1_1.dtd");
} catch (Exception e) {
- LogHelper.logError("org.jboss.tools.jst.web.tiles", e);
+ ModelPlugin.getPluginLog().logError(e);
}
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesCompoundEditor.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -84,7 +84,7 @@
try {
getSite().setSelectionProvider(null);
} catch (Exception e) {
- // Ignore
+ TilesUIPlugin.getPluginLog().logError(e);
}
}
super.dispose();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditor.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditor.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -94,6 +94,7 @@
import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.tiles.model.helpers.TilesStructureHelper;
+import org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin;
import org.jboss.tools.jst.web.tiles.ui.editor.action.TilesCopyAction;
import org.jboss.tools.jst.web.tiles.ui.editor.action.TilesCutAction;
import org.jboss.tools.jst.web.tiles.ui.editor.action.TilesDeleteAction;
@@ -512,6 +513,7 @@
printer.getDPI();
printer.getClientArea();
} catch (Exception ee) {
+ TilesUIPlugin.getPluginLog().logError(ee);
ex = ee;
printer.dispose();
d = null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -13,6 +13,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin;
+
/**
* @author Igels
*
@@ -31,6 +33,7 @@
try {
return resourceBundle.getString(key);
} catch (MissingResourceException e) {
+ TilesUIPlugin.getPluginLog().logError(e);
return "%" + key + "%";
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/TilesCompoundCommand.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/TilesCompoundCommand.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/commands/TilesCompoundCommand.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.meta.action.XAction;
import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin;
public class TilesCompoundCommand extends Command {
private List<Object> elements = new ArrayList<Object>();
@@ -44,6 +45,7 @@
else
return false;
} catch (Exception ex) {
+ TilesUIPlugin.getPluginLog().logError(ex);
return false;
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesElement.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -20,6 +20,7 @@
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.meta.*;
+import org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin;
import org.jboss.tools.jst.web.tiles.ui.editor.model.ITilesElement;
import org.jboss.tools.jst.web.tiles.ui.editor.model.ITilesModel;
@@ -110,6 +111,7 @@
;
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/model/impl/TilesModel.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -561,6 +561,7 @@
try {
return Integer.parseInt(str);
} catch (Exception ex) {
+ TilesUIPlugin.getPluginLog().logError(ex);
return DEFAULT_VERTICAL_SPACING;
}
}
@@ -573,6 +574,7 @@
try {
return Integer.parseInt(str);
} catch (Exception 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/editors/TLDEditorMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/TLDEditorMessages.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/TLDEditorMessages.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -13,6 +13,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
+
public class TLDEditorMessages {
private static final String RESOURCE_BUNDLE= "org.jboss.tools.jst.web.ui.editors.TLDEditorMessages";
@@ -24,6 +26,7 @@
try {
return resourceBundle.getString(key);
} catch (MissingResourceException e) {
+ WebUiPlugin.getPluginLog().logError(e);
return "%" + key + "%";
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -27,6 +27,7 @@
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.dnd.DnDUtil;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
public class XDropAdapterAssistant extends CommonDropAdapterAssistant {
@@ -48,6 +49,7 @@
try {
DnDUtil.paste(targetObject, p);
} catch (ActionDeclinedException de) {
+ WebUiPlugin.getPluginLog().logError(de);
return null;
} catch (Exception e) {
ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/AddProjectTemplateResourcesView.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/AddProjectTemplateResourcesView.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/AddProjectTemplateResourcesView.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -21,6 +21,7 @@
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.model.*;
import org.jboss.tools.jst.web.project.handlers.*;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
public class AddProjectTemplateResourcesView extends AbstractSpecialWizardStep {
private final static int SIZING_SELECTION_WIDGET_WIDTH = 400;
@@ -86,6 +87,7 @@
try {
members = ((IContainer) o).members();
} catch (CoreException e) {
+ WebUiPlugin.getPluginLog().logError(e);
//just return an empty set of children
return new Object[0];
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -33,6 +33,7 @@
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.context.ImportWebDirProjectContext;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.ui.WebUiPlugin;
@@ -89,7 +90,7 @@
updatePerspective();
BasicNewResourceWizard.selectAndReveal(context.getProjectHandle(), ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());
} catch (Exception ex) {
- ProblemReportingHelper.reportProblem(WebUiPlugin.PLUGIN_ID, ex);
+ WebUiPlugin.getPluginLog().logError(ex);
result = false;
}
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -347,6 +347,7 @@
try {
project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
} catch (Exception e) {
+ WebUiPlugin.getPluginLog().logError(e);
setErrorMessage(e.getMessage());
return false;
}
@@ -372,6 +373,7 @@
hasJavaNature = project.exists() && project.hasNature(JavaCore.NATURE_ID);
hasNature = project.exists() && project.hasNature(context.getNatureID());
} catch (CoreException e) {
+ WebUiPlugin.getPluginLog().logError(e);
hasNature = project.exists();
}
if(project.exists() && (!hasNature) && hasJavaNature) {
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 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -74,7 +74,7 @@
updatePerspective();
BasicNewResourceWizard.selectAndReveal(context.getProjectHandle(), ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());
} catch (Exception ex) {
- ProblemReportingHelper.reportProblem(WebUiPlugin.PLUGIN_ID, ex);
+ WebUiPlugin.getPluginLog().logError(ex);
result = false;
}
return result;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java 2008-03-19 16:54:07 UTC (rev 7018)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/NewWebProjectWizard.java 2008-03-19 17:38:31 UTC (rev 7019)
@@ -27,6 +27,7 @@
import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.jst.web.project.helpers.NewWebProjectContext;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
import org.jboss.tools.jst.web.ui.operation.WebNatureOperation;
public abstract class NewWebProjectWizard extends Wizard implements INewWizard, IExecutableExtension {
@@ -69,11 +70,13 @@
result = false;
}
} catch (InvocationTargetException e) {
+ WebUiPlugin.getPluginLog().logError(e);
String message = WizardKeys.getString(CANNOT_CREATE_LOCATION + ".ErrorMessage") + ": " + context.getLocationPath();
Status status = new Status(IStatus.ERROR, "org.jboss.tools.jst.web.ui", 0, message, e);
ProblemReportingHelper.reportProblem(status);
result = false;
} catch (InterruptedException e) {
+ WebUiPlugin.getPluginLog().logError(e);
String message = WizardKeys.getString(CANNOT_CREATE_LOCATION+".ErrorMessage")+": "+context.getLocationPath();
Status status = new Status(IStatus.ERROR, "org.jboss.tools.jst.web.ui", 0, message, e);
ProblemReportingHelper.reportProblem(status);
More information about the jbosstools-commits
mailing list