JBoss Tools SVN: r3577 - trunk/seam/plugins/org.jboss.tools.seam.xml.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-12 05:59:10 -0400 (Wed, 12 Sep 2007)
New Revision: 3577
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties
Log:
http://jira.jboss.org/jira/browse/JBIDE-825
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties 2007-09-12 09:59:06 UTC (rev 3576)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties 2007-09-12 09:59:10 UTC (rev 3577)
@@ -5,5 +5,15 @@
plugin.properties,\
about.html,\
dtds/,\
- seam-xml.jar
+ seam-xml.jar,\
+ schemas/
jars.compile.order = seam-xml.jar
+src.includes = dtds/,\
+ src/,\
+ schemas/,\
+ resources/,\
+ plugin.xml,\
+ plugin.properties,\
+ build.properties,\
+ about.html,\
+ META-INF/
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3576 - in trunk/seam/plugins/org.jboss.tools.seam.text.ext: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-12 05:59:06 -0400 (Wed, 12 Sep 2007)
New Revision: 3576
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties
Log:
http://jira.jboss.org/jira/browse/JBIDE-825
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2007-09-12 07:31:01 UTC (rev 3575)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/META-INF/MANIFEST.MF 2007-09-12 09:59:06 UTC (rev 3576)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Eclipse-LazyStart: true
Bundle-Name: Seam Text Editors Extensions
-Bundle-ClassPath: seamextensions.jar
+Bundle-ClassPath: seam-text-ext.jar
Bundle-Activator: org.jboss.tools.seam.text.ext.SeamExtPlugin
Bundle-ManifestVersion: 2
Bundle-Vendor: %providerName
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties 2007-09-12 07:31:01 UTC (rev 3575)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/build.properties 2007-09-12 09:59:06 UTC (rev 3576)
@@ -1,10 +1,15 @@
source.seamextensions.jar = src/
-output.seamextensions.jar = bin/
+output.seam-text-ext.jar = bin/
bin.includes = plugin.xml,\
- seamextensions.jar,\
+ seam-text-ext.jar,\
META-INF/,\
- plugin.properties
-source.seamextensions.jar = src/
+ plugin.properties,\
+ about.html
+source.seam-text-ext.jar = src/
src.includes = src/,\
plugin.xml,\
+ plugin.properties,\
+ build.properties,\
+ about.html,\
META-INF/
+source.seam-text-ext.jar = src/
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3575 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-09-12 03:31:01 -0400 (Wed, 12 Sep 2007)
New Revision: 3575
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
http://jira.jboss.com/jira/browse/EXIN-337
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-11 23:53:54 UTC (rev 3574)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-12 07:31:01 UTC (rev 3575)
@@ -322,7 +322,7 @@
assertTrue("Component \"beatles.Pall\" not found!",component!=null);
}
- public void tstDeleteComponentInClass(){
+ public void testDeleteComponentInClass(){
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3574 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-11 19:53:54 -0400 (Tue, 11 Sep 2007)
New Revision: 3574
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
fix test errors.
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-11 21:10:08 UTC (rev 3573)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-11 23:53:54 UTC (rev 3574)
@@ -71,176 +71,143 @@
assertTrue("Cannot find components.xml in test project", componentsFile != null && componentsFile.exists());
}
- public void testSeamComponentViewFromComponentsXML(){
- addComponent();
- renameComponent();
- deleteComponent();
- }
-
- public void testSeamComponentViewFromClasses(){
- addClass();
- renameClass();
- deleteClass();
- }
-
- public void addComponent(){
- System.out.println("addComponent...");
-
+ public void testAddComponentInXmlFile(){
SeamCorePlugin.getSeamProject(project, true);
refreshProject(project);
CommonNavigator navigator = getSeamComponentsView();
+
navigator.getCommonViewer().expandAll();
Tree tree = navigator.getCommonViewer().getTree();
- System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
- System.out.println("End tree.");
+ updateTree(tree);
-
ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
- assertTrue("Package \"myPackage\" found!",seamPackage==null);
- IFile file1 = project.getFile("WebContent/WEB-INF/components.1");
- assertTrue("Cannot find components.1 in test project", file1 != null && file1.exists());
+ assertTrue("Error in initial loading components from components.xml. " +
+ "Unexpected package 'myPackage' was found",seamPackage==null);
- System.out.println("Modifying...");
- try{
- componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ IFile file1 = project.getFile("WebContent/WEB-INF/components.1");
+ if(file1 == null || !file1.exists()) {
+ fail("Cannot find test data file 'WebContent/WEB-INF/components.1'");
+ }
+
+
+ try {
+ componentsFile.setContents(file1.getContents(),
+ true, false, new NullProgressMonitor());
componentsFile.touch(new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.1", ex);
+ } catch (CoreException e) {
+ JUnitUtils.fail("Error in changing 'components.xml' content to " +
+ "'WebContent/WEB-INF/components.1'", e);
}
refreshProject(project);
-
- System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
- System.out.println("End tree.");
+ updateTree(tree);
+
seamPackage = findSeamPackage(tree, "myPackage");
- assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
-
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent");
- assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null);
- }
+ assertTrue("Seam model is not updated, expected package 'myPackage'" +
+ " is not found in tree",seamPackage!=null);
+ ISeamComponent component = findSeamComponent(seamPackage,
+ "myPackage.myStringComponent");
+
+ assertTrue("Expected component 'myPackage.myStringComponent' was not" +
+ " found",component!=null);
+
}
- public void renameComponent(){
- System.out.println("renameComponent...");
+ public void testRenameComponentInXmlFile(){
- System.out.println("phase 1...");
-
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
Tree tree = navigator.getCommonViewer().getTree();
-
- System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
- System.out.println("End tree.");
+ updateTree(tree);
ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
- assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent");
- assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null);
- }
+ assertTrue("Expected package 'myPackage' was not found it tree",
+ seamPackage!=null);
- IFile file1 = project.getFile("WebContent/WEB-INF/components.2");
- assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
+ ISeamComponent component = findSeamComponent(seamPackage,
+ "myPackage.myStringComponent");
- System.out.println("Modifying...");
+ assertTrue("Expected component 'myPackage.myStringComponent' was not" +
+ " found",component!=null);
+
+ IFile file1 = project.getFile("WebContent/WEB-INF/components.2");
+ if(file1 == null || !file1.exists()) {
+ fail("Cannot find test data file 'WebContent/WEB-INF/components.2'");
+ }
+
try{
componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
componentsFile.touch(new NullProgressMonitor());
}catch(Exception ex){
- JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex);
+ JUnitUtils.fail("Error in changing 'components.xml' content to " +
+ "'WebContent/WEB-INF/components.2'", ex);
}
refreshProject(project);
- System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
- System.out.println("End tree.");
+ updateTree(tree);
seamPackage = findSeamPackage(tree, "myPackage");
- assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
+ assertTrue("Expected package 'myPackage' was not found it tree",
+ seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myTextComponent");
- assertTrue("Component \"myPackage.myTextComponent\" not found!",component!=null);
- }
+ component = findSeamComponent(seamPackage, "myPackage.myTextComponent");
+ assertTrue("Expected component 'myPackage.myTextComponent' not found " +
+ "after renaming",component!=null);
- System.out.println("phase 2...");
-
- IFile file2 = project.getFile("WebContent/WEB-INF/components.3");
- assertTrue("Cannot find components.3 in test project", file2 != null && file2.exists());
-
- System.out.println("Modifying...");
+ file1 = project.getFile("WebContent/WEB-INF/components.3");
+ if(file1 == null || !file1.exists()) {
+ fail("Cannot find test data file 'WebContent/WEB-INF/components.3'");
+ }
try{
- componentsFile.setContents(file2.getContents(), true, false, new NullProgressMonitor());
+ componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
componentsFile.touch(new NullProgressMonitor());
}catch(Exception ex){
- JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.3", ex);
+ JUnitUtils.fail("Error in changing 'components.xml' content to " +
+ "'WebContent/WEB-INF/components.3'", ex);
}
refreshProject(project);
- System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
- System.out.println("End tree.");
+ updateTree(tree);
seamPackage = findSeamPackage(tree, "myNewPackage");
- assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null);
+ assertTrue("Expected package 'myNewPackage' was not found it tree after " +
+ "renaming",
+ seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent");
- assertTrue("Component \"myNewPackage.myTextComponent\" not found!",component!=null);
- }
-
+ component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent");
+ assertTrue("Expected component 'myNewPackage.myTextComponent' not found " +
+ "after renaming",component!=null);
}
- public void deleteComponent(){
- System.out.println("deleteComponent...");
+ public void testDeleteComponentInXmlFile(){
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
-
+
Tree tree = navigator.getCommonViewer().getTree();
- System.out.println("tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
+ updateTree(tree);
ISeamPackage seamPackage = findSeamPackage(tree, "myNewPackage");
assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent");
- assertTrue("Component \"myNewPackage.myTextComponent\" not found!",component!=null);
- }
+ ISeamComponent component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent");
+ assertTrue("Component \"myNewPackage.myTextComponent\" not found!",component!=null);
IFile file1 = project.getFile("WebContent/WEB-INF/components.4");
assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
- System.out.println("Modifying...");
try{
componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
componentsFile.touch(new NullProgressMonitor());
@@ -250,19 +217,18 @@
refreshProject(project);
+ updateTree(tree);
+
seamPackage = findSeamPackage(tree, "myNewPackage");
assertTrue("Package \"myNewPackage\" found!",seamPackage==null);
}
- public void addClass(){
- System.out.println("addClass...");
-
+ public void testAddComponentInClass(){
+
classFile = project.getFile("JavaSource/demo/Person.java");
assertTrue("Cannot find Person.java in test project", componentsFile != null);
- //refreshProject(project);
-
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -274,7 +240,6 @@
IFile file1 = project.getFile("JavaSource/demo/Person.1");
assertTrue("Cannot find Person.1 in test project", file1 != null && file1.exists());
- System.out.println("Modifying...");
try{
classFile.create(file1.getContents(), false, new NullProgressMonitor());
classFile.touch(new NullProgressMonitor());
@@ -284,18 +249,20 @@
refreshProject(project);
+ updateTree(tree);
+
seamPackage = findSeamPackage(tree, "demo");
assertTrue("Package \"demo\" not found!",seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "demo.John");
- assertTrue("Component \"demo.John\" not found!",component!=null);
- }
+ ISeamComponent component = findSeamComponent(seamPackage, "demo.John");
+ assertTrue("Component \"demo.John\" not found!",component!=null);
+
}
- private void renameClass(){
- System.out.println("renameClass...");
+ public void testRenameComponentInClass(){
+
+ classFile = project.getFile("JavaSource/demo/Person.java");
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -305,38 +272,35 @@
ISeamPackage seamPackage = findSeamPackage(tree, "demo");
assertTrue("Package \"demo\" not found!",seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "demo.John");
- assertTrue("Component \"demo.John\" not found!",component!=null);
- }
+ ISeamComponent component = findSeamComponent(seamPackage, "demo.John");
+ assertTrue("Component \"demo.John\" not found!",component!=null);
IFile file1 = project.getFile("JavaSource/demo/Person.2");
assertTrue("Cannot find Person.2 in test project", file1 != null && file1.exists());
- System.out.println("Modifying...");
try{
classFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
classFile.touch(new NullProgressMonitor());
}catch(Exception ex){
- JUnitUtils.fail("Cannot read file JavaSource/demo/Person.1", ex);
+ JUnitUtils.fail("Cannot read file JavaSource/demo/Person.2", ex);
}
refreshProject(project);
+ updateTree(tree);
+
seamPackage = findSeamPackage(tree, "demo");
assertTrue("Package \"demo\" not found!",seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "demo.John");
- assertTrue("Component \"demo.John\" found!",component==null);
+
+ component = findSeamComponent(seamPackage, "demo.John");
+ assertTrue("Component \"demo.John\" found!",component==null);
- component = findSeamComponent(seamPackage, "demo.Pall");
- assertTrue("Component \"demo.Pall\" not found!",component!=null);
- }
+ component = findSeamComponent(seamPackage, "demo.Pall");
+ assertTrue("Component \"demo.Pall\" not found!",component!=null);
IFile file2 = project.getFile("JavaSource/demo/Person.3");
assertTrue("Cannot find Person.3 in test project", file2 != null && file2.exists());
- System.out.println("Modifying...");
try{
classFile.setContents(file2.getContents(), true, false, new NullProgressMonitor());
classFile.touch(new NullProgressMonitor());
@@ -346,22 +310,19 @@
refreshProject(project);
+ updateTree(tree);
+
seamPackage = findSeamPackage(tree, "demo");
assertTrue("Package \"demo\" found!",seamPackage==null);
seamPackage = findSeamPackage(tree, "beatles");
assertTrue("Package \"beatles\" not found!",seamPackage!=null);
- if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "beatles.Pall");
- assertTrue("Component \"beatles.Pall\" not found!",component!=null);
- }
-
+ component = findSeamComponent(seamPackage, "beatles.Pall");
+ assertTrue("Component \"beatles.Pall\" not found!",component!=null);
}
- private void deleteClass(){
- System.out.println("deleteClass...");
-
+ public void tstDeleteComponentInClass(){
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -375,16 +336,16 @@
assertTrue("Component \"beatles.Pall\" not found!",component!=null);
}
- System.out.println("Modifying...");
try{
classFile.delete(true, new NullProgressMonitor());
- classFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot delete file JavaSource/demo/Person.java", ex);
}
refreshProject(project);
+ updateTree(tree);
+
seamPackage = findSeamPackage(tree, "beatles");
assertTrue("Package \"beatles\" found!",seamPackage==null);
}
@@ -411,11 +372,6 @@
} catch (Exception e) {
JUnitUtils.fail("Cannot refresh created test Project", e);
}
- /*try {
- XJob.waitForJob();
- } catch (InterruptedException e) {
- JUnitUtils.fail(e.getMessage(),e);
- }*/
IStructuredContentProvider content
= (IStructuredContentProvider)getSeamComponentsView().getCommonViewer().getContentProvider();
assertTrue("Created Seam enabled project haven't been shown in tree",1==content.getElements(ResourcesPlugin.getWorkspace().getRoot()).length);
@@ -509,16 +465,20 @@
private ISeamPackage findSeamPackage(TreeItem item, String name){
ISeamPackage seamPackage=null;
- if(item.getData() instanceof ISeamScope){
- seamPackage = findSeamPackage((ISeamScope)item.getData(), name);
- if(seamPackage != null) return seamPackage;
- }
for(int i=0;i<item.getItemCount();i++){
- seamPackage = findSeamPackage(item.getItem(i), name);
- if(seamPackage != null) return seamPackage;
+ TreeItem cur = item.getItem(i);
+ if(cur.getData() instanceof ISeamPackage) {
+ ISeamPackage pkg =(ISeamPackage)cur.getData();
+ if(name.equals(pkg.getName())) {
+ seamPackage = pkg;
+ break;
+ }
+ }else {
+ seamPackage = findSeamPackage(cur, name);
+ }
}
- return null;
+ return seamPackage;
}
private ISeamPackage findSeamPackage(Tree tree, String name){
@@ -645,4 +605,10 @@
}
+ public void updateTree(Tree tree) {
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
+ }
+
+ }
}
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3573 - in trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as: classpath and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-11 17:10:08 -0400 (Tue, 11 Sep 2007)
New Revision: 3573
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
Log:
Added a test for old-style classpath containers
Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java 2007-09-11 21:10:08 UTC (rev 3573)
@@ -0,0 +1,107 @@
+package org.jboss.ide.eclipse.as.classpath.test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JEEClasspathContainerTest extends TestCase {
+
+ private static final int ORIGINAL_ENTRIES = 3;
+
+ private TestProjectProvider provider;
+ private IProject project;
+
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null, "basicwebproject", true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+
+ public void testJEE13ClasspathContainer() {
+ testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3", 7);
+ }
+
+ public void testJEE14ClasspathContainer() {
+ testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4", 8);
+ }
+
+ public void testJEE50ClasspathContainer() {
+ testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.javaee-5.0", 1);
+ }
+
+
+ protected void testGenericClasspathContainer(String containerPath, int expectedEntries) {
+ try {
+ IJavaProject jproject = JavaCore.create(project);
+ IPath path = new Path(containerPath);
+ verifyContainerEntries(path, jproject, expectedEntries);
+ verifyRawClasspathCount(jproject, ORIGINAL_ENTRIES);
+ verifyNotIncludedEntry(jproject, path);
+ int beforeRawCount = jproject.getRawClasspath().length;
+ int beforeResolvedCount = jproject.getResolvedClasspath(true).length;
+ addContainer(jproject, path);
+ assertEquals(beforeRawCount+1, jproject.getRawClasspath().length);
+ assertEquals(beforeResolvedCount+expectedEntries, jproject.getResolvedClasspath(true).length);
+ beforeRawCount = jproject.getRawClasspath().length;
+ beforeResolvedCount = jproject.getResolvedClasspath(true).length;
+ removeContainer(jproject, path);
+ assertEquals(beforeRawCount-1, jproject.getRawClasspath().length);
+ assertEquals(beforeResolvedCount-expectedEntries, jproject.getResolvedClasspath(true).length);
+
+ } catch( JavaModelException jme ) {
+ fail("Exception: " + jme.getMessage());
+ } catch( CoreException ce ) {
+ fail("Exception: " + ce.getMessage());
+ }
+
+ }
+
+ protected void verifyContainerEntries(IPath path, IJavaProject jproject, int expected) throws JavaModelException {
+ IClasspathContainer cpc = JavaCore.getClasspathContainer(path, jproject);
+ IClasspathEntry[] entries = cpc.getClasspathEntries();
+ assertEquals("Received unexpected number of entries", expected, entries.length );
+ }
+
+ protected void verifyRawClasspathCount(IJavaProject jproject, int count) throws JavaModelException {
+ IClasspathEntry[] projectEntry = jproject.getRawClasspath();
+ assertEquals("Project should start with only 3 classpath entries", count, projectEntry.length);
+ }
+
+ protected void verifyNotIncludedEntry(IJavaProject jproject, IPath path) throws JavaModelException {
+ IClasspathEntry[] projectEntry = jproject.getRawClasspath();
+ for( int i = 0; i < projectEntry.length; i++ ) {
+ if( projectEntry[i].getPath().toOSString().startsWith(path.toOSString())) {
+ assertFalse("Project prematurely includes classpath", true);
+ }
+ }
+ }
+
+ protected void addContainer(IJavaProject jproject, IPath path) throws JavaModelException {
+ ArrayList tmp = new ArrayList();
+ tmp.addAll(Arrays.asList(jproject.getRawClasspath()));
+ tmp.add(JavaCore.newContainerEntry(path));
+ jproject.setRawClasspath((IClasspathEntry[]) tmp.toArray(new IClasspathEntry[tmp.size()]), null);
+ }
+
+ protected void removeContainer(IJavaProject jproject, IPath path) throws JavaModelException {
+ ArrayList tmp = new ArrayList();
+ tmp.addAll(Arrays.asList(jproject.getRawClasspath()));
+ tmp.remove(JavaCore.newContainerEntry(path));
+ jproject.setRawClasspath((IClasspathEntry[]) tmp.toArray(new IClasspathEntry[tmp.size()]), null);
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2007-09-11 17:52:25 UTC (rev 3572)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2007-09-11 21:10:08 UTC (rev 3573)
@@ -1,5 +1,7 @@
package org.jboss.ide.eclipse.as.test;
+import org.jboss.ide.eclipse.as.classpath.test.JEEClasspathContainerTest;
+
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -8,7 +10,7 @@
TestSuite suite = new TestSuite("Archives Tests");
suite.addTestSuite(ASClasspathTest.class);
-
+ suite.addTestSuite(JEEClasspathContainerTest.class);
return suite;
}
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3572 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-09-11 13:52:25 -0400 (Tue, 11 Sep 2007)
New Revision: 3572
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
http://jira.jboss.com/jira/browse/EXIN-337
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-11 17:49:50 UTC (rev 3571)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-11 17:52:25 UTC (rev 3572)
@@ -542,14 +542,14 @@
while(true){
System.out.println("Refresh project "+count);
try {
-// project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
// waitForJobs();
// try {
// waitForJob();
// } catch (InterruptedException e) {
// JUnitUtils.fail(e.getMessage(),e);
// }
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+// project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
//waitForJobs();
try {
waitForJob();
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3571 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-09-11 13:49:50 -0400 (Tue, 11 Sep 2007)
New Revision: 3571
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
http://jira.jboss.com/jira/browse/EXIN-337
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-11 17:14:53 UTC (rev 3570)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-11 17:49:50 UTC (rev 3571)
@@ -30,7 +30,10 @@
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.internal.decorators.DecoratorManager;
import org.eclipse.ui.navigator.CommonNavigator;
+import org.eclipse.ui.progress.UIJob;
+import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.jst.web.ui.RedHat4WebPerspectiveFactory;
import org.jboss.tools.seam.core.ISeamComponent;
@@ -68,29 +71,36 @@
assertTrue("Cannot find components.xml in test project", componentsFile != null && componentsFile.exists());
}
- public void testComponentView(){
+ public void testSeamComponentViewFromComponentsXML(){
addComponent();
renameComponent();
deleteComponent();
-
+ }
+
+ public void testSeamComponentViewFromClasses(){
addClass();
renameClass();
deleteClass();
}
public void addComponent(){
+ System.out.println("addComponent...");
+
SeamCorePlugin.getSeamProject(project, true);
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
- }
+ refreshProject(project);
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
Tree tree = navigator.getCommonViewer().getTree();
+
+ System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
+ }
+ System.out.println("End tree.");
+
ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
assertTrue("Package \"myPackage\" found!",seamPackage==null);
@@ -98,18 +108,22 @@
IFile file1 = project.getFile("WebContent/WEB-INF/components.1");
assertTrue("Cannot find components.1 in test project", file1 != null && file1.exists());
+ System.out.println("Modifying...");
try{
- componentsFile.setContents(file1.getContents(), false, false, new NullProgressMonitor());
+ componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ componentsFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.1", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
+ refreshProject(project);
+
+ System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
}
-
+ System.out.println("End tree.");
+
seamPackage = findSeamPackage(tree, "myPackage");
assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
@@ -121,10 +135,20 @@
}
public void renameComponent(){
+ System.out.println("renameComponent...");
+
+ System.out.println("phase 1...");
+
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
Tree tree = navigator.getCommonViewer().getTree();
+
+ System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
+ }
+ System.out.println("End tree.");
ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
@@ -137,17 +161,21 @@
IFile file1 = project.getFile("WebContent/WEB-INF/components.2");
assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
+ System.out.println("Modifying...");
try{
- componentsFile.setContents(file1.getContents(), false, false, new NullProgressMonitor());
+ componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ componentsFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
+ refreshProject(project);
+
+ System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
}
+ System.out.println("End tree.");
seamPackage = findSeamPackage(tree, "myPackage");
assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
@@ -157,20 +185,26 @@
assertTrue("Component \"myPackage.myTextComponent\" not found!",component!=null);
}
+ System.out.println("phase 2...");
+
IFile file2 = project.getFile("WebContent/WEB-INF/components.3");
assertTrue("Cannot find components.3 in test project", file2 != null && file2.exists());
+ System.out.println("Modifying...");
try{
- componentsFile.setContents(file2.getContents(), false, false, new NullProgressMonitor());
+ componentsFile.setContents(file2.getContents(), true, false, new NullProgressMonitor());
+ componentsFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.3", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
+ refreshProject(project);
+
+ System.out.println("Tree tree.getItemCount() - "+tree.getItemCount());
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
}
+ System.out.println("End tree.");
seamPackage = findSeamPackage(tree, "myNewPackage");
assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null);
@@ -183,15 +217,17 @@
}
public void deleteComponent(){
+ System.out.println("deleteComponent...");
+
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
Tree tree = navigator.getCommonViewer().getTree();
-// System.out.println("tree.getItemCount() - "+tree.getItemCount());
-// for(int i=0;i<tree.getItemCount();i++){
-// showTreeItem(tree.getItem(i),0);
-// }
+ System.out.println("tree.getItemCount() - "+tree.getItemCount());
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
+ }
ISeamPackage seamPackage = findSeamPackage(tree, "myNewPackage");
assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null);
@@ -204,45 +240,28 @@
IFile file1 = project.getFile("WebContent/WEB-INF/components.4");
assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
+ System.out.println("Modifying...");
try{
- componentsFile.setContents(file1.getContents(), false, false, new NullProgressMonitor());
+ componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ componentsFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.4", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
- }
+ refreshProject(project);
-// System.out.println("Before!");
-//
-// waitForJobs();
-//
-// System.out.println("After!");
-
-// System.out.println("tree.getItemCount() - "+tree.getItemCount());
-// for(int i=0;i<tree.getItemCount();i++){
-// showTreeItem(tree.getItem(i),0);
-// }
-
seamPackage = findSeamPackage(tree, "myNewPackage");
assertTrue("Package \"myNewPackage\" found!",seamPackage==null);
}
public void addClass(){
+ System.out.println("addClass...");
classFile = project.getFile("JavaSource/demo/Person.java");
assertTrue("Cannot find Person.java in test project", componentsFile != null);
-
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
- }
+ //refreshProject(project);
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -255,17 +274,15 @@
IFile file1 = project.getFile("JavaSource/demo/Person.1");
assertTrue("Cannot find Person.1 in test project", file1 != null && file1.exists());
+ System.out.println("Modifying...");
try{
classFile.create(file1.getContents(), false, new NullProgressMonitor());
+ classFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file JavaSource/demo/Person.1", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
- }
+ refreshProject(project);
seamPackage = findSeamPackage(tree, "demo");
assertTrue("Package \"demo\" not found!",seamPackage!=null);
@@ -278,6 +295,8 @@
}
private void renameClass(){
+ System.out.println("renameClass...");
+
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -294,17 +313,15 @@
IFile file1 = project.getFile("JavaSource/demo/Person.2");
assertTrue("Cannot find Person.2 in test project", file1 != null && file1.exists());
+ System.out.println("Modifying...");
try{
- classFile.setContents(file1.getContents(), false, false, new NullProgressMonitor());
+ classFile.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ classFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file JavaSource/demo/Person.1", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
- }
+ refreshProject(project);
seamPackage = findSeamPackage(tree, "demo");
assertTrue("Package \"demo\" not found!",seamPackage!=null);
@@ -319,17 +336,15 @@
IFile file2 = project.getFile("JavaSource/demo/Person.3");
assertTrue("Cannot find Person.3 in test project", file2 != null && file2.exists());
+ System.out.println("Modifying...");
try{
- classFile.setContents(file2.getContents(), false, false, new NullProgressMonitor());
+ classFile.setContents(file2.getContents(), true, false, new NullProgressMonitor());
+ classFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file JavaSource/demo/Person.3", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
- }
+ refreshProject(project);
seamPackage = findSeamPackage(tree, "demo");
assertTrue("Package \"demo\" found!",seamPackage==null);
@@ -345,6 +360,8 @@
}
private void deleteClass(){
+ System.out.println("deleteClass...");
+
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -358,17 +375,15 @@
assertTrue("Component \"beatles.Pall\" not found!",component!=null);
}
+ System.out.println("Modifying...");
try{
- classFile.delete(false, new NullProgressMonitor());
+ classFile.delete(true, new NullProgressMonitor());
+ classFile.touch(new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot delete file JavaSource/demo/Person.java", ex);
}
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build test Project", e);
- }
+ refreshProject(project);
seamPackage = findSeamPackage(tree, "beatles");
assertTrue("Package \"beatles\" found!",seamPackage==null);
@@ -519,9 +534,41 @@
return null;
}
+ private static final int NUMBER_OF_REFRESHES = 1;
+
+ private void refreshProject(IProject project){
+ long timestamp = project.getModificationStamp();
+ int count = 1;
+ while(true){
+ System.out.println("Refresh project "+count);
+ try {
+// project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+// waitForJobs();
+// try {
+// waitForJob();
+// } catch (InterruptedException e) {
+// JUnitUtils.fail(e.getMessage(),e);
+// }
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ //waitForJobs();
+ try {
+ waitForJob();
+ } catch (InterruptedException e) {
+ JUnitUtils.fail(e.getMessage(),e);
+ }
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot build test Project", e);
+ break;
+ }
+ if(project.getModificationStamp() != timestamp) break;
+ count++;
+ if(count > NUMBER_OF_REFRESHES) break;
+ }
+ }
+
public void waitForJobs() {
while (Job.getJobManager().currentJob() != null)
- delay(10000);
+ delay(5000);
}
/** * Process UI input but do not return for the
@@ -546,4 +593,56 @@
}
}
}
+ public static void waitForJob() throws InterruptedException {
+ Object[] o = {
+ XJob.FAMILY_XJOB, ResourcesPlugin.FAMILY_AUTO_REFRESH, ResourcesPlugin.FAMILY_AUTO_BUILD
+ };
+ while(true) {
+ boolean stop = true;
+ for (int i = 0; i < o.length; i++) {
+ Job[] js = Job.getJobManager().find(o[i]);
+ if(js != null && js.length > 0) {
+ Job.getJobManager().join(o[i], new NullProgressMonitor());
+ stop = false;
+ }
+ }
+ if(stop) {
+ Job running = getJobRunning(10);
+ if(running != null) {
+ running.join();
+ stop = false;
+ }
+ }
+ if(stop) break;
+ }
+ }
+
+ public static Job getJobRunning(int iterationLimit) {
+ Job[] js = Job.getJobManager().find(null);
+ Job dm = null;
+ if(js != null) for (int i = 0; i < js.length; i++) {
+ if(js[i].getState() == Job.RUNNING && js[i].getThread() != Thread.currentThread()) {
+ if(js[i] instanceof UIJob) continue;
+ if(js[i].belongsTo(DecoratorManager.FAMILY_DECORATE) || js[i].getName().equals("Task List Saver")) {
+ dm = js[i];
+ continue;
+ }
+ //TODO keep watching
+ System.out.println(js[i].getName());
+ return js[i];
+ }
+ }
+ if(dm != null) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ //ignore
+ }
+ if(iterationLimit > 0)
+ return getJobRunning(iterationLimit - 1);
+ }
+ return null;
+
+ }
+
}
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3570 - in trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal: views/properties and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 13:14:53 -0400 (Tue, 11 Sep 2007)
New Revision: 3570
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/BreakpointImageProvider.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/ToggleBreakpointAction.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/WebDataPreferencePage.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/ActionFormValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionForwardValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMappingValueProxy.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/ActionValueProxy.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/ArrayListVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayPartitionVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EmptyVariable.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ExceptionConfigValueProxy.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/HashMapEntryValueProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapEntryVariableProxy.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/HashMapVariableProxy.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/HashtableVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestAttributesVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestHeadersVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestParametersVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestValueProxy.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/HttpSessionAttributesVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpSessionVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextAttributesVariableProxy.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/ServletContextAttributesVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextInitParametersVariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextVariableProxy.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/TypeSupport.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/VariableProxy.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/VariableProxyFactory.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/internal/views/xpl/WebDataViewContentProvider.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewEventHandler.java
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewInput.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-894 Clean out jst component
Code clean up is performed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/BreakpointImageProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/BreakpointImageProvider.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/BreakpointImageProvider.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -16,6 +16,7 @@
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.jdt.debug.core.IJavaBreakpoint;
import org.eclipse.ui.internal.ide.IMarkerImageProvider;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -51,7 +52,7 @@
if (installed) return iconPath + "brkpid_obj.gif"; //$NON-NLS-1$
return iconPath + "brkpd_obj.gif";//$NON-NLS-1$
} catch (CoreException e) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
return null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/ToggleBreakpointAction.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/ToggleBreakpointAction.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/ToggleBreakpointAction.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -187,6 +187,7 @@
}
catch (BadLocationException ex)
{
+ WebDebugUIPlugin.getPluginLog().logError(ex);
}
}
return false;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/WebDataPreferencePage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/WebDataPreferencePage.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/WebDataPreferencePage.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -24,6 +24,7 @@
import org.jboss.tools.common.model.ui.attribute.editor.IFieldEditor;
import org.jboss.tools.common.model.ui.widgets.IWidgetSettings;
import org.jboss.tools.common.model.ui.widgets.WhiteSettings;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
/**
@@ -142,7 +143,7 @@
gd = new GridData(GridData.FILL_BOTH);
control[1].setLayoutData(gd);
} catch (Exception e) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
Control button = buttonController.createButton(treeButtonComposite);
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -20,6 +20,7 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -77,7 +78,7 @@
try {
fStore.addPropertyChangeListener(this);
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
@@ -149,7 +150,7 @@
}
}
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
@@ -225,7 +226,7 @@
try {
listeners[i].propertyChanged(property);
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionFormValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionFormValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionFormValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -22,6 +22,7 @@
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget;
import org.eclipse.jdt.internal.debug.core.model.JDIValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
import com.sun.jdi.ClassType;
@@ -101,7 +102,7 @@
}
} catch (Exception e) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
}
@@ -110,6 +111,7 @@
fVariables = (IVariable[])variables.toArray(new IVariable[variables.size()]);
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionForwardValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionForwardValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionForwardValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -50,6 +51,7 @@
fVariables[2] = VariableProxyFactory.createVariable(fStackFrameWrapper, redirect, VariableProxy.class);
fVariables[3] = VariableProxyFactory.createVariable(fStackFrameWrapper, contextRelative, VariableProxy.class);
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMappingValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMappingValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMappingValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -18,6 +18,7 @@
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -100,6 +101,7 @@
fVariables = (IVariable[])list.toArray(new IVariable[list.size()]);
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -114,6 +116,7 @@
globalForwards = EvaluationSupport.findVariableForName(mcVars, "forwards");
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return globalForwards;
}
@@ -129,6 +132,7 @@
globalExceptions = EvaluationSupport.findVariableForName(mcVars, "exceptions");
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return globalExceptions;
}
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionMessagesVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -20,6 +20,7 @@
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.eclipse.jdt.internal.debug.core.model.JDIThread;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -29,22 +30,19 @@
ActionMessagesVariableProxy(StackFrameWrapper frameWrapper, IVariable origin) {
super(frameWrapper, origin);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
+ IValue value = getOriginValue(origin);
initValue(value);
}
ActionMessagesVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias) {
super(frameWrapper, origin, alias);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
+ IValue value = getOriginValue(origin);
initValue(value);
}
ActionMessagesVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias, String type) {
super(frameWrapper, origin, alias, type);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
+ IValue value = getOriginValue(origin);
initValue(value);
}
@@ -52,11 +50,23 @@
super(frameWrapper, result, alias, type);
IValue value = null;
if (result != null && !result.hasErrors()) {
- try { value = result.getValue(); } catch (Exception e) { }
+ try {
+ value = result.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
initValue(value);
}
+ private IValue getOriginValue(IVariable origin) {
+ try {
+ return origin.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ return null;
+ }
+ }
private void initValue (IValue value) {
fValue = (value == null || value instanceof JDINullValue ? null : new ActionMessagesValueProxy(fStackFrameWrapper, value));
}
@@ -85,7 +95,9 @@
if(thisFrame == null || thisFrame.isTerminated()) return null;
IVariable[] stackVars = null;
try { stackVars = fStackFrameWrapper.getFrameVariables(); }
- catch (Exception e) {}
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
IVariable variable = EvaluationSupport.findVariableForName(stackVars, "errors");
if (variable != null) return variable;
@@ -99,7 +111,10 @@
IStackFrame currentFrame = (IStackFrame)frames.get(i);
if (!thisFrame.equals(currentFrame)) {
try { stackVars = fStackFrameWrapper.getFrameVariables(); }
- catch (Exception e) {}
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
+
variable = EvaluationSupport.findVariableForName(stackVars, "errors");
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/ActionValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ActionValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -20,6 +20,7 @@
import org.eclipse.jdt.debug.core.IJavaValue;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.jboss.tools.jst.web.debug.ui.internal.views.properties.xpl.WebDataProperties;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -68,6 +69,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -18,6 +18,7 @@
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -65,6 +66,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -81,6 +83,7 @@
int size = (fVariables == null ? 0 : fVariables.length);
text = text.append(type).append('(').append(size).append(')');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayListVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -42,6 +43,7 @@
fValue = (value == null ? null : ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, ArrayListValueProxy.class));
((ArrayListValueProxy)fValue).fVariables = null;
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
fHasValueChanged = false;
return fValue;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayPartitionVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayPartitionVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayPartitionVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -35,6 +36,7 @@
value = getOriginValue();
fValue = (value == null ? null : ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, ArrayPartitionValueProxy.class));
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
fHasValueChanged = false;
return fValue;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ArrayValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -19,6 +19,7 @@
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.debug.core.IJavaVariable;
import org.eclipse.jdt.internal.debug.core.model.JDIValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -50,6 +51,7 @@
}
fVariables = (IVariable[])variables.toArray(new IVariable[variables.size()]);
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -88,6 +90,7 @@
// text = text.append(type).append('(').append(fVariables.size()).append(')');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EmptyVariable.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EmptyVariable.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EmptyVariable.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -23,6 +23,7 @@
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
/**
@@ -57,6 +58,7 @@
if (showTypeName) text = text.append(getReferenceTypeName()).append(' ');
text = text.append(getName()).append(WebUIMessages.VALUE_NOT_RESOLVED);
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -15,6 +15,7 @@
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -62,6 +63,7 @@
fVariables[1] = VariableProxyFactory.createVariable(fStackFrameWrapper, value);
((VariableProxy)fVariables[1]).setOrigin(value);
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -78,6 +80,7 @@
String value = fVariables[1].getValue().getValueString();
text = text.append('<').append(key).append("> : <").append(value).append('>');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationEntryVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -42,6 +43,7 @@
fValue = (value == null ? null : ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, EnumerationEntryValueProxy.class));
// ((HeadersEntryValueProxy)fValue).fVariables = null;
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
fHasValueChanged = false;
return fValue;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/EnumerationValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -17,6 +17,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -61,6 +62,7 @@
fVariables = (IVariable[])list.toArray(new IVariable[list.size()]);
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -76,6 +78,7 @@
int size = (vars == null ? 0 : vars.length);
text = text.append(type).append('(').append(size).append(')');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ExceptionConfigValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ExceptionConfigValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ExceptionConfigValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -49,6 +50,7 @@
fVariables[2] = new VariableProxy(fStackFrameWrapper, path);
fVariables[3] = new VariableProxy(fStackFrameWrapper, scope);
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/FilteredVariablesEnumeration.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -107,6 +107,7 @@
return false;
}
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
@@ -117,6 +118,7 @@
return true;
}
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
return false;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapEntryValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapEntryValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapEntryValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -46,6 +47,7 @@
fVariables[1] = VariableProxyFactory.createVariable(fStackFrameWrapper, value);
((VariableProxy)fVariables[1]).setOrigin(value);
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -62,6 +64,7 @@
String value = fVariables[1].getValue().getValueString();
text = text.append('<').append(key).append("> : <").append(value).append('>');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapEntryVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapEntryVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapEntryVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -48,6 +49,7 @@
IValue value = getOriginValue();
fValue = (value == null ? null : ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, HashMapEntryValueProxy.class));
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
fHasValueChanged = false;
return fValue;
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -19,6 +19,7 @@
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.debug.core.IJavaVariable;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -62,6 +63,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -97,6 +99,7 @@
count++;
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
return count;
@@ -113,6 +116,7 @@
int size = getMapSize();
text = text.append(type).append('(').append(size).append(')');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashMapVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -43,6 +44,7 @@
fValue = (value == null ? null : ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, HashMapValueProxy.class));
((HashMapValueProxy)fValue).fVariables = null;
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
fHasValueChanged = false;
return fValue;
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -19,6 +19,7 @@
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.debug.core.IJavaVariable;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -62,6 +63,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
private int addVariablesToList(List list, int count, IVariable[] vars) {
@@ -80,6 +82,7 @@
count++;
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
return count;
@@ -96,6 +99,7 @@
int size = (fVariables == null ? 0 : fVariables.length);
text = text.append(type).append('(').append(size).append(')');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HashtableVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -14,6 +14,7 @@
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -42,6 +43,7 @@
fValue = (value == null ? null : ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, HashtableValueProxy.class));
((HashtableValueProxy)fValue).fVariables = null;
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
fHasValueChanged = false;
return fValue;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestAttributesVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestAttributesVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestAttributesVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
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;
/**
@@ -47,6 +48,7 @@
}
return result;
} 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/HttpServletRequestHeadersVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestHeadersVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestHeadersVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
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;
/**
@@ -52,6 +53,7 @@
}
return result;
} 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/HttpServletRequestParametersVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestParametersVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestParametersVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
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;
/**
@@ -46,6 +47,7 @@
}
return result;
} 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/HttpServletRequestValueProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestValueProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -22,6 +22,7 @@
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.jboss.tools.jst.web.debug.ui.internal.views.properties.xpl.WebDataProperties;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -78,7 +79,9 @@
IEvaluationResult resultValue = evaluateSessionVariable();
HttpSessionVariableProxy variable = new HttpSessionVariableProxy(fStackFrameWrapper, resultValue, "session", "javax.servlet.http.HttpSession");
list.add(variable);
- } catch (Exception x) {}
+ } catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ }
}
}
String stopWords = "inputStream reader";
@@ -86,7 +89,9 @@
try {
IVariable var = (IVariable)list.get(i);
stopWords += " " + var.getName();
- } catch (Exception x) {}
+ } catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ }
}
FilteredVariablesEnumeration filtered =
@@ -117,6 +122,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -135,6 +141,7 @@
if (result == null || result.hasErrors()) return null;
return result;
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
return null;
}
@@ -153,6 +160,7 @@
if (result == null || result.hasErrors()) return null;
return result;
} 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/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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletRequestVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -20,6 +20,7 @@
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.eclipse.jdt.internal.debug.core.model.JDIThread;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -29,34 +30,41 @@
HttpServletRequestVariableProxy(StackFrameWrapper frameWrapper, IVariable origin) {
super(frameWrapper, origin);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpServletRequestVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias) {
super(frameWrapper, origin, alias);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpServletRequestVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias, String type) {
super(frameWrapper, origin, alias, type);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpServletRequestVariableProxy(StackFrameWrapper frameWrapper, IEvaluationResult result, String alias, String type) {
super(frameWrapper, result, alias, type);
IValue value = null;
if (result != null && !result.hasErrors()) {
- try { value = result.getValue(); } catch (Exception e) { }
+ try {
+ value = result.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
initValue(value);
}
+ private IValue getOriginValue(IVariable origin) {
+ try {
+ return origin.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ return null;
+ }
+ }
+
private void initValue (IValue value) {
fValue = (value == null || value instanceof JDINullValue ? null
: ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, HttpServletRequestValueProxy.class));
@@ -93,7 +101,9 @@
if(thisFrame == null || thisFrame.isTerminated()) return null;
IVariable[] stackVars = null;
try { stackVars = stackFrameWrapper.getFrameVariables(); }
- catch (Exception e) {}
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
IVariable variable = EvaluationSupport.findVariableForName(stackVars, "request");
if (variable != null) {
@@ -109,7 +119,9 @@
IStackFrame currentFrame = (IStackFrame)frames.get(i);
if (!thisFrame.equals(currentFrame)) {
try { stackVars = stackFrameWrapper.getFrameVariables(); }
- catch (Exception e) {}
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
variable = EvaluationSupport.findVariableForName(stackVars, "request");
if (variable != null) return substByInternalVariable(variable, "request", "javax.servlet.ServletRequest");
}
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpServletResponseVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -23,6 +23,7 @@
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.eclipse.jdt.internal.debug.core.model.JDIThread;
import org.jboss.tools.jst.web.debug.ui.internal.views.properties.xpl.WebDataProperties;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -32,34 +33,41 @@
HttpServletResponseVariableProxy(StackFrameWrapper frameWrapper, IVariable origin) {
super(frameWrapper, origin);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpServletResponseVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias) {
super(frameWrapper, origin, alias);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpServletResponseVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias, String type) {
super(frameWrapper, origin, alias, type);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpServletResponseVariableProxy(StackFrameWrapper frameWrapper, IEvaluationResult result, String alias, String type) {
super(frameWrapper, result, alias, type);
IValue value = null;
if (result != null && !result.hasErrors()) {
- try { value = result.getValue(); } catch (Exception e) { }
+ try {
+ value = result.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
initValue(value);
}
+ private IValue getOriginValue(IVariable origin) {
+ try {
+ return origin.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ return null;
+ }
+ }
+
private void initValue (IValue value) {
fValue = (value == null || value instanceof JDINullValue ? null
: ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, HttpServletResponseValueProxy.class));
@@ -96,7 +104,9 @@
if(thisFrame == null || thisFrame.isTerminated()) return null;
IVariable[] stackVars = null;
try { stackVars = fStackFrameWrapper.getFrameVariables(); }
- catch (Exception e) { }
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
IVariable variable = EvaluationSupport.findVariableForName(stackVars, "response");
if (variable != null) {
@@ -112,7 +122,9 @@
IStackFrame currentFrame = (IStackFrame)frames.get(i);
if (!thisFrame.equals(currentFrame)) {
try { stackVars = fStackFrameWrapper.getFrameVariables(); }
- catch (Exception e) { }
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
variable = EvaluationSupport.findVariableForName(stackVars, "response");
if (variable != null) return substByInternalVariable(variable, "response", "javax.servlet.ServletResponse");
}
@@ -164,6 +176,7 @@
fVariables = (IVariable[])list.toArray(new IVariable[list.size()]);
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpSessionAttributesVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpSessionAttributesVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpSessionAttributesVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
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;
/**
@@ -47,6 +48,7 @@
}
return result;
} 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/HttpSessionVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpSessionVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/HttpSessionVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -24,6 +24,7 @@
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.jboss.tools.jst.web.debug.ui.internal.views.properties.xpl.WebDataProperties;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -34,35 +35,42 @@
HttpSessionVariableProxy(StackFrameWrapper frameWrapper, IVariable origin) {
super(frameWrapper, origin);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
-
+ initValue(getOriginValue(origin));
}
HttpSessionVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias) {
super(frameWrapper, origin, alias);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpSessionVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias, String type) {
super(frameWrapper, origin, alias, type);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
HttpSessionVariableProxy(StackFrameWrapper frameWrapper, IEvaluationResult result, String alias, String type) {
super(frameWrapper, result, alias, type);
IValue value = null;
if (result != null && !result.hasErrors()) {
- try { value = result.getValue(); } catch (Exception e) { }
+ try {
+ value = result.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
initValue(value);
}
+
+ private IValue getOriginValue(IVariable origin) {
+ try {
+ return origin.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ return null;
+ }
+ }
+
private void initValue (IValue value) {
fValue = (value == null || value instanceof JDINullValue ? null
: ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, HttpSessionValueProxy.class));
@@ -101,6 +109,7 @@
if (result == null || result.hasErrors()) return null;
return result;
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
return null;
}
@@ -143,7 +152,9 @@
try {
IVariable var = (IVariable)list.get(i);
stopWords += " " + var.getName();
- } catch (Exception x) {}
+ } catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ }
}
FilteredVariablesEnumeration filtered =
@@ -174,6 +185,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextAttributesVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextAttributesVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextAttributesVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
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;
/**
@@ -44,6 +45,7 @@
}
return result;
} 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/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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/PageContextVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -25,6 +25,7 @@
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.eclipse.jdt.internal.debug.core.model.JDIThread;
import org.jboss.tools.jst.web.debug.ui.internal.views.properties.xpl.WebDataProperties;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -34,34 +35,41 @@
PageContextVariableProxy(StackFrameWrapper frameWrapper, IVariable origin) {
super(frameWrapper, origin);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
PageContextVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias) {
super(frameWrapper, origin, alias);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
PageContextVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias, String type) {
super(frameWrapper, origin, alias, type);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
PageContextVariableProxy(StackFrameWrapper frameWrapper, IEvaluationResult result, String alias, String type) {
super(frameWrapper, result, alias, type);
IValue value = null;
if (result != null && !result.hasErrors()) {
- try { value = result.getValue(); } catch (Exception e) { }
+ try {
+ value = result.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
initValue(value);
}
+ private IValue getOriginValue(IVariable origin) {
+ try {
+ return origin.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ return null;
+ }
+ }
+
private void initValue (IValue value) {
fValue = (value == null || value instanceof JDINullValue ? null : ValueProxyFactory.createValueProxy(fStackFrameWrapper, value, PageContextValueProxy.class));
}
@@ -97,7 +105,9 @@
if(thisFrame == null || thisFrame.isTerminated()) return null;
IVariable[] stackVars = null;
try { stackVars = fStackFrameWrapper.getFrameVariables(); }
- catch (Exception e) {}
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
IVariable variable = EvaluationSupport.findVariableForName(stackVars, "pageContext");
if (variable != null) return variable;
@@ -111,7 +121,9 @@
IStackFrame currentFrame = (IStackFrame)frames.get(i);
if (!thisFrame.equals(currentFrame)) {
try { stackVars = fStackFrameWrapper.getFrameVariables(); }
- catch (Exception e) { }
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
variable = EvaluationSupport.findVariableForName(stackVars, "pageContext");
if (variable != null) return variable;
}
@@ -157,7 +169,9 @@
try {
IVariable var = (IVariable)list.get(i);
stopWords += " " + var.getName();
- } catch (Exception x) {}
+ } catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ }
}
FilteredVariablesEnumeration filtered =
@@ -188,6 +202,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextAttributesVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextAttributesVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextAttributesVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
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;
/**
@@ -48,6 +49,7 @@
}
return result;
} 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/ServletContextInitParametersVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextInitParametersVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextInitParametersVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
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;
/**
@@ -48,6 +49,7 @@
}
return result;
} 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/ServletContextVariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextVariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ServletContextVariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -24,6 +24,7 @@
import org.eclipse.jdt.debug.eval.IEvaluationResult;
import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
import org.jboss.tools.jst.web.debug.ui.internal.views.properties.xpl.WebDataProperties;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
import org.jboss.tools.jst.web.debug.xpl.EvaluationSupport;
/**
@@ -35,34 +36,41 @@
ServletContextVariableProxy(StackFrameWrapper frameWrapper, IVariable origin) {
super(frameWrapper, origin);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
ServletContextVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias) {
super(frameWrapper, origin, alias);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
ServletContextVariableProxy(StackFrameWrapper frameWrapper, IVariable origin, String alias, String type) {
super(frameWrapper, origin, alias, type);
- IValue value = null;
- try { value = origin.getValue(); } catch (Exception e) { }
- initValue(value);
+ initValue(getOriginValue(origin));
}
ServletContextVariableProxy(StackFrameWrapper frameWrapper, IEvaluationResult result, String alias, String type) {
super(frameWrapper, result, alias, type);
IValue value = null;
if (result != null && !result.hasErrors()) {
- try { value = result.getValue(); } catch (Exception e) { }
+ try {
+ value = result.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
initValue(value);
}
+ private IValue getOriginValue(IVariable origin) {
+ try {
+ return origin.getValue();
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ return null;
+ }
+ }
+
private void initValue (IValue value) {
fValue = (value == null || value instanceof JDINullValue ? null : new ServletContextValueProxy(fStackFrameWrapper, value));
}
@@ -101,6 +109,7 @@
if (result == null || result.hasErrors()) return null;
return result;
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
return null;
}
@@ -148,7 +157,9 @@
try {
IVariable var = (IVariable)list.get(i);
stopWords += " " + var.getName();
- } catch (Exception x) {}
+ } catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ }
}
FilteredVariablesEnumeration filtered =
@@ -179,6 +190,7 @@
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StackFrameWrapper.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -94,14 +94,18 @@
if (fHasValueChanged) fWebData.updateVariables();
vars[count] = fWebData;
count++;
- } catch (Exception e) { }
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
if (wdp.isEnabledFilter(WebDataProperties.SHOW_STRUTS_VARIABLES_PROPERTY)) {
try {
if (fHasValueChanged) fStrutsData.updateVariables();
vars[count] = fStrutsData;
count++;
- } catch (Exception e) { }
+ } catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
}
IVariable[] newVars = new IVariable[count];
for (int i = 0; i < count; i++) newVars[i] = vars[i];
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/StrutsData.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -111,7 +111,9 @@
if (resultValue instanceof IVariable) {
var.setOrigin((IVariable)resultValue);
try { var.fAlias = ((IVariable)resultValue).getName(); }
- catch (Exception e) { }
+ catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
+ }
} else {
var.fAlias = "mapping"; //$NON-NLS-1$
var.fType = "org.apache.struts.action.ActionMapping"; //$NON-NLS-1$
@@ -262,6 +264,7 @@
if (result == null || result.hasErrors()) return null;
return result;
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
return null;
}
@@ -272,7 +275,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, "mapping"); //$NON-NLS-1$
if (variable != null) return variable;
@@ -291,7 +296,9 @@
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, "mapping"); //$NON-NLS-1$
if (variable != null) return variable;
variable = EvaluationSupport.findVariableForName(stackVars, "actionMapping"); //$NON-NLS-1$
@@ -307,7 +314,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, "form"); //$NON-NLS-1$
if (variable != null) return variable;
@@ -320,6 +329,7 @@
return thisVariable;
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
JDIThread thread = (JDIThread)thisFrame.getThread();
@@ -331,7 +341,9 @@
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, "form"); //$NON-NLS-1$
if (variable != null) return variable;
}
@@ -348,6 +360,7 @@
if (result == null || result.hasErrors() || !result.getValue().isAllocated()) return null;
return result;
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return null;
}
@@ -358,7 +371,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 thisVariable = EvaluationSupport.findVariableForName(stackVars, "this"); //$NON-NLS-1$
if(thisVariable == null) return null;
@@ -367,6 +382,7 @@
return thisVariable;
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return null;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/TypeSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/TypeSupport.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/TypeSupport.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -18,6 +18,7 @@
import org.eclipse.jdt.debug.core.IJavaClassType;
import org.eclipse.jdt.debug.core.IJavaInterfaceType;
import org.eclipse.jdt.debug.core.IJavaType;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -42,6 +43,7 @@
try {
return SIMPLE_TYPES.contains(javaType.getName());
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return false;
}
@@ -52,7 +54,9 @@
if (isClassType(javaType)) {
return SIMPLE_TYPE_WRAPPERS.contains(javaType.getName());
}
- } catch (Exception x) { }
+ } catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
+ }
return false;
}
@@ -118,6 +122,7 @@
}
}
} 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/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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -67,6 +67,7 @@
fVariables = (IVariable[])list.toArray(new IVariable[list.size()]);
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
}
@@ -141,7 +142,9 @@
if (!TypeSupport.isSimpleTypeOrWrapper(((IJavaValue)fOrigin).getJavaType())) {
return fOrigin.hasVariables();
}
- } catch (Exception e) { }
+ } 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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/ValueProxyFactory.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -13,6 +13,7 @@
import org.eclipse.debug.core.model.IValue;
import org.eclipse.jdt.internal.debug.core.model.JDIValue;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -40,6 +41,7 @@
try {
vp = (IValue)cls.getDeclaredConstructor(new Class[]{StackFrameWrapper.class, IValue.class}).newInstance(new Object[]{frameWrapper, value});
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
// if(value != null && vp != null) valueProxies.put(value, vp);
}
@@ -96,6 +98,7 @@
return new ValueProxy(frameWrapper, value);
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return new ValueProxy(frameWrapper, proxy);
@@ -165,6 +168,7 @@
return new ValueProxy(frameWrapper, value);
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return new ValueProxy(frameWrapper, proxy);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/VariableProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/VariableProxy.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/VariableProxy.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -139,6 +139,7 @@
getReferenceTypeName()));
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
fHasValueChanged = false;
setChangeCount(fStackFrameWrapper.getChangeCount());
@@ -149,6 +150,7 @@
try {
return fResult.getValue();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return null;
}
@@ -157,6 +159,7 @@
try {
return fOrigin.getValue();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return null;
}
@@ -276,6 +279,7 @@
return v;
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return variable;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/VariableProxyFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/VariableProxyFactory.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/VariableProxyFactory.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -18,6 +18,7 @@
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.jdt.debug.core.IJavaType;
import org.eclipse.jdt.debug.core.IJavaVariable;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* @author Jeremy
@@ -44,6 +45,7 @@
try {
vp = (VariableProxy)cls.getDeclaredConstructor(new Class[]{StackFrameWrapper.class, IVariable.class}).newInstance(new Object[]{frameWrapper, origin});
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
if(origin != null && vp != null) variableProxies.put(origin, vp);
}
@@ -76,6 +78,7 @@
return new ActionMessagesVariableProxy(frameWrapper, origin);
}
} catch (Exception ex) {
+ WebDebugUIPlugin.getPluginLog().logError(ex);
}
return new VariableProxy(frameWrapper, origin);
}
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 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataView.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -208,6 +208,7 @@
return getVariableProxyText((IVariable) element, true);
}
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return super.getText(element);
}
@@ -247,6 +248,7 @@
if (notNull && quoteValue)
text = text.append('"');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
@@ -280,6 +282,7 @@
if (notNull && quoteValue)
text = text.append('"');
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
@@ -293,6 +296,7 @@
' ');
text = text.append(variable.getName());
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return text.toString();
}
@@ -334,6 +338,7 @@
try {
origin = ((ActionMappingValueProxy) value).getOrigin();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
if (origin != null) {
ProxyValueDetailListener pl = new ProxyValueDetailListener(
@@ -350,6 +355,7 @@
try {
origin = ((ValueProxy) value).getOrigin();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
if (origin != null) {
ProxyValueDetailListener pl = new ProxyValueDetailListener(
@@ -670,7 +676,7 @@
loadTree();
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
@@ -728,6 +734,7 @@
try {
t = d.getThreads();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
for (int i = 0; i < t.length; i++)
fExpandedVariables.remove(t[i]);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewContentProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewContentProvider.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewContentProvider.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -27,6 +27,7 @@
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
/**
* Provide the contents for a variables viewer.
@@ -78,7 +79,7 @@
try {
children = ((IVariable)parent).getValue().getVariables();
} catch (Exception ee) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(ee);
}
}
if (children != null) {
@@ -86,7 +87,7 @@
return children;
}
} catch (Exception e) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return new Object[0];
}
@@ -208,7 +209,7 @@
clearCache();
this.fViewer = viewer;
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
@@ -216,7 +217,7 @@
try {
fWrapper.doChange();
} catch (Exception x) {
- //ignore
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewEventHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewEventHandler.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewEventHandler.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -114,6 +114,7 @@
// TODO-3.3: WTP 2.0
// ((WebDataViewContentProvider) getWebDataView().getWebDataViewer().getContentProvider()).postChange();
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
// TODO replace with valid code
/// refresh();
@@ -169,6 +170,7 @@
/// refresh();
getWebDataView().populateDetailPane();
} catch (Exception x) {
+ WebDebugUIPlugin.getPluginLog().logError(x);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewInput.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewInput.java 2007-09-11 17:11:55 UTC (rev 3569)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/xpl/WebDataViewInput.java 2007-09-11 17:14:53 UTC (rev 3570)
@@ -17,6 +17,7 @@
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.core.model.IThread;
+import org.jboss.tools.jst.web.debug.ui.xpl.WebDebugUIPlugin;
public class WebDataViewInput {
@@ -27,6 +28,7 @@
try {
if(frame != null && !frame.isTerminated()) thread = frame.getThread();
} catch (Exception e) {
+ WebDebugUIPlugin.getPluginLog().logError(e);
}
return create(thread);
}
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3569 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 13:11:55 -0400 (Tue, 11 Sep 2007)
New Revision: 3569
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesRecognizer.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-894 Clean out jst component
Code clean up is performed
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 2007-09-11 17:11:46 UTC (rev 3568)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesRecognizer.java 2007-09-11 17:11:55 UTC (rev 3569)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.web.tiles.model;
+import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.common.model.loaders.*;
import org.jboss.tools.common.xml.XMLEntityResolver;
@@ -17,7 +18,9 @@
static {
try {
XMLEntityResolver.registerPublicEntity(TilesConstants.DOC_PUBLICID, FileTilesRecognizer.class, "/meta/tiles_config_1_1.dtd");
- } catch (Exception e) {}
+ } catch (Exception e) {
+ LogHelper.logError("org.jboss.tools.jst.web.tiles", e);
+ }
}
public String getEntityName(String ext, String body) {
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r3568 - trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-11 13:11:46 -0400 (Tue, 11 Sep 2007)
New Revision: 3568
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckClass.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-894 Clean out jst component
Code clean up is performed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckClass.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckClass.java 2007-09-11 17:11:37 UTC (rev 3567)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckClass.java 2007-09-11 17:11:46 UTC (rev 3568)
@@ -12,6 +12,7 @@
import org.eclipse.jdt.core.IType;
+import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintQClassName;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
@@ -34,10 +35,14 @@
IType type = object.getModel().getValidType(value);
if(type != null) {
String mustImpl = null;
- try { mustImpl = checkImplements(object, type); } catch (Exception e) {}
+ try { mustImpl = checkImplements(object, type); } catch (Exception e) {
+ LogHelper.logError("org.jboss.tools.jst.web.verification", e);
+ }
if(mustImpl != null) return fireImplements(object, attr, attr, value, mustImpl);
String mustExtend = null;
- try { mustExtend = checkExtends(object, type); } catch (Exception e) {}
+ try { mustExtend = checkExtends(object, type); } catch (Exception e) {
+ LogHelper.logError("org.jboss.tools.jst.web.verification", e);
+ }
if(mustExtend != null) return fireExtends(object, attr, attr, value, mustExtend);
return null;
}
16 years, 9 months
- 1
- 0