svn commit: r752983 - in /incubator/click/trunk/click/framework/src/org/apache/click/element: JsImport.java JsScript.java

[sa...@apache.org]

Author: sabob
Date: Thu Mar 12 19:39:25 2009
New Revision: 752983

URL: http://svn.apache.org/viewvc?rev=752983&view=rev
Log:
added element package and basic elementsfix imports

Modified:
    incubator/click/trunk/click/framework/src/org/apache/click/element/JsImport.java
    incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java

Modified: incubator/click/trunk/click/framework/src/org/apache/click/element/JsImport.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/src/org/apache/click/element/JsImport.java?rev=752983&r1=752982&r2=752983&view=diff
==============================================================================
--- incubator/click/trunk/click/framework/src/org/apache/click/element/JsImport.java (original)
+++ incubator/click/trunk/click/framework/src/org/apache/click/element/JsImport.java Thu Mar 12 19:39:25 2009
@@ -19,13 +19,10 @@
 package org.apache.click.element;
 
 import org.apache.click.Context;
-import org.apache.click.util.HtmlHeader;
 import org.apache.click.util.HtmlStringBuffer;
-import org.apache.click.util.JavascriptImport;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- *
  * @author Bob Schellink
  */
 public class JsImport extends ResourceElement {
@@ -154,12 +151,12 @@
         }
 
         //2. Use the instanceof operator to check if the argument is of the correct type.
-        if (!(o instanceof JavascriptImport)) {
+        if (!(o instanceof JsImport)) {
             return false;
         }
 
         //3. Cast the argument to the correct type.
-        JavascriptImport that = (JavascriptImport) o;
+        JsImport that = (JsImport) o;
 
         return getSrc() == null ? that.getSrc() == null
             : getSrc().equals(that.getSrc());

Modified: incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java?rev=752983&r1=752982&r2=752983&view=diff
==============================================================================
--- incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java (original)
+++ incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java Thu Mar 12 19:39:25 2009
@@ -18,9 +18,7 @@
  */
 package org.apache.click.element;
 
-import org.apache.click.util.HtmlHeader;
 import org.apache.click.util.HtmlStringBuffer;
-import org.apache.click.util.Javascript;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
@@ -172,12 +170,12 @@
         }
 
         //2. Use the instanceof operator to check if the argument is of the correct type.
-        if (!(o instanceof Javascript)) {
+        if (!(o instanceof JsScript)) {
             return false;
         }
 
         //3. Cast the argument to the correct type.
-        Javascript that = (Javascript) o;
+        JsScript that = (JsScript) o;
 
         String id = getId();
         String thatId = that.getId();