[jbosstools-commits] JBoss Tools SVN: r7076 - in trunk/common/plugins/org.jboss.tools.common.verification: src/org/jboss/tools/common/verification/vrules/core/resources and 2 other directories.

Monday, 24 March 2008

Author: scabanovich
Date: 2008-03-24 10:54:24 -0400 (Mon, 24 Mar 2008)
New Revision: 7076

Modified:
   trunk/common/plugins/org.jboss.tools.common.verification/.classpath
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java
  
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
Log:
JBIDE-893

Modified: trunk/common/plugins/org.jboss.tools.common.verification/.classpath
===================================================================

--- trunk/common/plugins/org.jboss.tools.common.verification/.classpath	2008-03-24
14:53:57 UTC (rev 7075)
+++ trunk/common/plugins/org.jboss.tools.common.verification/.classpath	2008-03-24
14:54:24 UTC (rev 7076)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="src" path="resources/"/>
-	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src"
path="/org.jboss.tools.common.model.ui"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="resources/"/>
+	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -40,7 +40,9 @@
 			try {
 				XModelObject o = FileSystemsHelper.getWebInf(n.getModel());
 				clear(o);				
-			} catch (Exception e) {}
+			} catch (Exception e) {
+				ModelPlugin.getPluginLog().logError(e);
+			}
 		}
 	}
 	

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VTaskListenerImpl.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -17,6 +17,7 @@
 import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
 import org.jboss.tools.common.model.markers.ResourceProblems;
 import org.jboss.tools.common.model.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
 import org.jboss.tools.common.model.util.PositionHolder;
 import org.jboss.tools.common.verification.vrules.*;
 import org.jboss.tools.common.verification.vrules.layer.VObjectImpl;
@@ -120,9 +121,11 @@
 		if(o == null) return limit = -1;
 		String s = o.getAttributeValue(attr);
 		limit = -1;
-		if(!"unlimited".equals(s)) try {
+		if(!"unlimited".equals(s) && s != null && s.length() > 0)
try {
 			limit = Integer.parseInt(s);
-		} catch (Exception e) {}
+		} catch (NumberFormatException e) {
+			ModelPlugin.getPluginLog().logError(e);
+		}
 		return limit;		
 	}	
 	

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyConfigurationHandler.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -28,7 +28,7 @@
         return object != null && wizard != null;
     }
 
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
+    public void executeHandler(XModelObject object, Properties p) throws XModelException
{
     	if(p == null) p = new Properties();
         wizard.setObject(new Object[]{object, p});
         wizard.execute();

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleHandler.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -23,7 +23,7 @@
     public VerifyRuleHandler() {
     }
     
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
+    public void executeHandler(XModelObject object, Properties p) throws XModelException
{
         if (!isEnabled(object)) return;
 		VModel vmodel = VModelFactory.getModel(object.getModel());
         Map<String,List<VRule>> entities = new
HashMap<String,List<VRule>>();

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetAllHandler.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -23,7 +23,7 @@
     public VerifyRuleSetAllHandler() {
     }
     
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
+    public void executeHandler(XModelObject object, Properties p) throws XModelException
{
         if (!isEnabled(object)) return;
 		VModel vmodel = VModelFactory.getModel(object.getModel());
         Map<String,List<VRule>> entities = new
HashMap<String,List<VRule>>();

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRuleSetHandler.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -23,7 +23,7 @@
     public VerifyRuleSetHandler() {
     }
     
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
+    public void executeHandler(XModelObject object, Properties p) throws XModelException
{
         if (!isEnabled(object)) return;
 		VModel vmodel = VModelFactory.getModel(object.getModel());
         VObject vobject = vmodel.getObjectByPath(object.getPath());

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesAllHandler.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -23,7 +23,7 @@
     public VerifyRulesAllHandler() {
     }
 
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
+    public void executeHandler(XModelObject object, Properties p) throws XModelException
{
         if(!gui) executeHandlerDefault(object, p);
         else executeHandlerGUI(object, p);
     }
@@ -32,7 +32,7 @@
         return VHelper.getManager() != null;
     }
 
-    private void executeHandlerDefault(XModelObject object, Properties p) throws
Exception {
+    private void executeHandlerDefault(XModelObject object, Properties p) throws
XModelException {
         if (!isEnabled(object)) return;
 		VModel vmodel = VModelFactory.getModel(object.getModel());
         Map<String,List<VRule>> entities = new
HashMap<String,List<VRule>>();
@@ -60,7 +60,7 @@
     }
 
 
-    private void executeHandlerGUI(XModelObject object, Properties p) throws Exception {
+    private void executeHandlerGUI(XModelObject object, Properties p) throws
XModelException {
 
 		SpecialWizard wizard =
SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.verification.ui.vrules.wizard.runtime2.VerifyWizard");
         if(p == null) p = new Properties();

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/handler/VerifyRulesHandler.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -21,7 +21,7 @@
     public VerifyRulesHandler() {
     }
     
-    public void executeHandler(XModelObject object, Properties p) throws Exception {
+    public void executeHandler(XModelObject object, Properties p) throws XModelException
{
         if (!isEnabled(object)) return;
 		VModel vmodel = VModelFactory.getModel(object.getModel());
         VObject vobject = vmodel.getObjectByPath(object.getPath());

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VManagerModel.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -49,9 +49,14 @@
         VHelper.setManager(this);
         manager.setMessageFormat(new
VMessageFormat(getBundle(getAttributeValue("bundle")).getString(getAttributeValue("format
id"))));
         manager.setRuleSets(getRuleSets());
+    	String s = getAttributeValue("minimum significance");
         try {
-            manager.setMinSignificance(Integer.parseInt(getAttributeValue("minimum
significance")));
-        } catch (NumberFormatException e) {}
+        	if(s != null && s.length() > 0) {
+        		manager.setMinSignificance(Integer.parseInt(s));
+        	}
+        } catch (NumberFormatException e) {
+        	ModelPlugin.getPluginLog().logError(e);
+        }
         developer = "developer".equals(getAttributeValue("mode"));
         manager.addPropertyChangeListener(this);
     }
@@ -125,8 +130,12 @@
                 developer =
"developer".equals(getAttributeValue("mode"));
             } else if ("minimum significance".equals(name)) {
                 try {
-                    manager.setMinSignificance(Integer.parseInt(result));
-                } catch (NumberFormatException e) {}
+                	if(result != null && result.length() > 0) {
+                		manager.setMinSignificance(Integer.parseInt(result));
+                	}
+                } catch (NumberFormatException e) {
+                	ModelPlugin.getPluginLog().logError(e);
+                }
             }
         }
         return result;

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VResultTemplateModel.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -31,9 +31,12 @@
             template.setName(getAttributeValue("name"));
             template.setDescription(getAttributeValue("description"));
             template.setType(getAttributeValue("type"));
+            String s = getAttributeValue("significance");
             try {
-               
template.setSignificance(Integer.parseInt(getAttributeValue("significance")));
-            } catch (NumberFormatException e) {}
+                template.setSignificance(Integer.parseInt(s));
+            } catch (NumberFormatException e) {
+            	//ignore
+            }
             template.setFormat(getFormat(getAttributeValue("message id"),
rule));
             template.addPropertyChangeListener(this);
         }
@@ -58,7 +61,9 @@
             } else if ("significance".equals(name)) {
                 try {
                     template.setSignificance(Integer.parseInt(result));
-                } catch (NumberFormatException e) {}
+                } catch (NumberFormatException e) {
+                	//ignore
+                }
             } else if ("message id".equals(name)) {
                 template.setFormat(getFormat(result,
((VRuleModel)getParent()).getRule(null)));
             }

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -119,7 +119,9 @@
             } else if ("significance".equals(name)) {
                 try {
                     rule.setSignificance(Integer.parseInt(result));
-                } catch (NumberFormatException e) {}
+                } catch (NumberFormatException e) {
+                	//ignore
+                }
             } else if ("entities".equals(name)) {
                 VEntity[] oldEntities = rule.getEntities();
                 VEntity[] newEntities = getEntities(result);

Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java	2008-03-24
14:53:57 UTC (rev 7075)
+++
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleSetsLoader.java	2008-03-24
14:54:24 UTC (rev 7076)
@@ -43,7 +43,9 @@
 			try { 
 				if(url != null) url = FileLocator.resolve(url);
 				if(url != null) l.add(url);
-			} catch (Exception e) {}
+			} catch (IOException e) {
+				ModelPlugin.getPluginLog().logError(e);
+			}
 		}
 		it = l.iterator();
         while(it.hasNext()) {


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r7076 - in trunk/common/plugins/org.jboss.tools.common.verification: src/org/jboss/tools/common/verification/vrules/core/resources and 2 other directories.