[Yanel-commits] rev 23686 - public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-04-12 13:58:20 +0200 (Thu, 12 Apr 2007)
New Revision: 23686

Modified:
   public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java
   public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlDepthInputParameter.java
   public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlMaxPagesInputParameter.java
   public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/InputParameter.java
Log:
validity fixed

Modified: public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java
===================================================================
--- public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java	2007-04-12 11:48:22 UTC (rev 23685)
+++ public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/AddRealmResource2.java	2007-04-12 11:58:20 UTC (rev 23686)
@@ -328,6 +328,8 @@
         Element parameterElement = null;
         Parameter para = null;
         boolean valid = true;
+        boolean validate = false;
+        if (request.getParameter("submit-from-existing-website") != null) validate = true;
 
         // Parameter "realmid"
         para = getParameterFromResourceConfig("realmid");
@@ -434,6 +436,18 @@
             }
         }
 
+        // Parameter "crawldepth"
+        para = getParameterFromResourceConfig("crawldepth");
+        CrawlDepthInputParameter cdip = new CrawlDepthInputParameter(para.name, para.sampleValue, para.required, para.hidden, request.getParameter("crawldepth"), validate);
+        parameterElement = (Element) fromExistingWebsiteElement.appendChild(cdip.createElementNS(NAMESPACE, doc));
+        valid = valid && cdip.isValid();
+
+        // Parameter "crawlmaxpages"
+        para = getParameterFromResourceConfig("crawlmaxpages");
+        CrawlMaxPagesInputParameter cmpip = new CrawlMaxPagesInputParameter(para.name, para.sampleValue, para.required, para.hidden, request.getParameter("crawlmaxpages"), validate);
+        parameterElement = (Element) fromExistingWebsiteElement.appendChild(cmpip.createElementNS(NAMESPACE, doc));
+        valid = valid && cmpip.isValid();
+
         if (request.getParameter("submit-from-existing-website") != null) {
             if (valid) {
                 fromExistingWebsiteElement.appendChild(doc.createElementNS(NAMESPACE, "valid"));

Modified: public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlDepthInputParameter.java
===================================================================
--- public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlDepthInputParameter.java	2007-04-12 11:48:22 UTC (rev 23685)
+++ public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlDepthInputParameter.java	2007-04-12 11:58:20 UTC (rev 23686)
@@ -16,7 +16,7 @@
      *
      */
     public String validate(String value) {
-        if (value != null) return "NullPointer!";
+        if (value == null) return "NullPointer!";
         if (value.length() < 1) return "No value specified!";
         try {
             new Integer(value);

Modified: public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlMaxPagesInputParameter.java
===================================================================
--- public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlMaxPagesInputParameter.java	2007-04-12 11:48:22 UTC (rev 23685)
+++ public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/CrawlMaxPagesInputParameter.java	2007-04-12 11:58:20 UTC (rev 23686)
@@ -16,7 +16,7 @@
      *
      */
     public String validate(String value) {
-        if (value != null) return "NullPointer!";
+        if (value == null) return "NullPointer!";
         if (value.length() < 1) return "No value specified!";
         try {
             new Integer(value);

Modified: public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/InputParameter.java
===================================================================
--- public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/InputParameter.java	2007-04-12 11:48:22 UTC (rev 23685)
+++ public/yanel/trunk/src/resources/add-realm/src/java/org/wyona/yanel/impl/resources/InputParameter.java	2007-04-12 11:58:20 UTC (rev 23686)
@@ -52,8 +52,19 @@
      *
      */
     public String validate(String value) {
-        if (value != null) return "NullPointer!";
+        if (value == null) return "NullPointer!";
         if (value.length() < 1) return "No value specified!";
         return null;
     }
+
+    /**
+     *
+     */
+    public boolean isValid() {
+        if (validate(value) != null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }