Unfortunately with that change, it still does not compile :( :
jquery, jquery-examples, mootools, mootools-examples, etc.
(because of imports from net.sf.click and other very old classes).
I updated it however locally those imports and now compiles for me.
Should I check-in those changes?
Sure go ahead.
Here are my changes as attachment.
Index:
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/SelectDemo.java
===================================================================
---
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/SelectDemo.java
(revision 244)
+++
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/SelectDemo.java
(working copy)
@@ -2,19 +2,19 @@
import java.util.HashMap;
import java.util.Map;
-import net.sf.click.util.AjaxAdapter;
+import net.sf.clickclick.util.AjaxAdapter;
import org.apache.click.Context;
import org.apache.click.Control;
+import org.apache.click.element.CssStyle;
+import org.apache.click.element.JsScript;
import org.apache.click.control.Form;
import org.apache.click.control.Option;
import org.apache.click.control.Select;
import org.apache.click.util.HtmlStringBuffer;
-import net.sf.click.util.Partial;
+import org.apache.click.util.PageImports;
+import net.sf.clickclick.util.Partial;
import net.sf.clickclick.examples.jquery.page.BorderPage;
import net.sf.clickclick.jquery.controls.JQSelect;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.Css;
-import net.sf.clickclick.util.Javascript;
public class SelectDemo extends BorderPage {
@@ -43,7 +43,7 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = getAdvancedPageImports();
+ PageImports pageImports = getPageImports();
Context context = getContext();
Map model = new HashMap();
@@ -51,10 +51,10 @@
model.put("context", contextPath);
String cssTemplate = "/ajax/select-demo.css";
- pageImports.add(new Css(context.renderTemplate(cssTemplate, model)));
+ pageImports.add(new CssStyle(context.renderTemplate(cssTemplate,
model)));
String jsTemplate = "/ajax/select-demo.js";
- pageImports.add(new Javascript(context.renderTemplate(jsTemplate,
model)));
+ pageImports.add(new JsScript(context.renderTemplate(jsTemplate,
model)));
return null;
}
Index:
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/ActionDemo.java
===================================================================
---
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/ActionDemo.java
(revision 244)
+++
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/ActionDemo.java
(working copy)
@@ -3,9 +3,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.click.Control;
-import net.sf.click.util.AjaxAdapter;
+import net.sf.clickclick.util.AjaxAdapter;
import org.apache.click.util.HtmlStringBuffer;
-import net.sf.click.util.Partial;
+import net.sf.clickclick.util.Partial;
import net.sf.clickclick.control.html.Div;
import net.sf.clickclick.examples.jquery.page.BorderPage;
import net.sf.clickclick.jquery.controls.JQActionButton;
Index:
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/FormDemo.java
===================================================================
---
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/FormDemo.java
(revision 244)
+++
jquery-examples/src/net/sf/clickclick/examples/jquery/page/ajax/FormDemo.java
(working copy)
@@ -3,13 +3,13 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.click.Control;
-import net.sf.click.AjaxListener;
+import net.sf.clickclick.AjaxListener;
import org.apache.click.control.Checkbox;
import org.apache.click.control.Submit;
import org.apache.click.control.TextField;
import org.apache.click.extras.control.EmailField;
import org.apache.click.util.HtmlStringBuffer;
-import net.sf.click.util.Partial;
+import net.sf.clickclick.util.Partial;
import net.sf.clickclick.examples.jquery.page.BorderPage;
import net.sf.clickclick.jquery.controls.JQForm;
import net.sf.clickclick.control.html.Div;
Index:
jquery-examples/src/net/sf/clickclick/examples/jquery/page/BorderPage.java
===================================================================
--- jquery-examples/src/net/sf/clickclick/examples/jquery/page/BorderPage.java
(revision 244)
+++ jquery-examples/src/net/sf/clickclick/examples/jquery/page/BorderPage.java
(working copy)
@@ -2,7 +2,6 @@
import org.apache.click.extras.control.Menu;
import org.apache.click.util.ClickUtils;
-import net.sf.clickclick.util.AdvancedPageImports;
public class BorderPage extends BasePage {
@@ -19,10 +18,6 @@
addModel("srcPath", srcPath);
}
- public AdvancedPageImports getAdvancedPageImports() {
- return (AdvancedPageImports) getPageImports();
- }
-
/**
* @see #getTemplate()
*/
Index:
jquery-examples/src/net/sf/clickclick/examples/jquery/page/controls/DialogDemo.java
===================================================================
---
jquery-examples/src/net/sf/clickclick/examples/jquery/page/controls/DialogDemo.java
(revision 244)
+++
jquery-examples/src/net/sf/clickclick/examples/jquery/page/controls/DialogDemo.java
(working copy)
@@ -5,6 +5,9 @@
import org.apache.click.control.Button;
import org.apache.click.control.Checkbox;
import org.apache.click.control.Label;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsScript;
+import org.apache.click.element.CssStyle;
import net.sf.clickclick.control.Text;
import net.sf.clickclick.control.grid.Grid;
@@ -14,9 +17,6 @@
import net.sf.clickclick.control.html.table.Row;
import net.sf.clickclick.jquery.controls.JQDialog;
import net.sf.clickclick.examples.jquery.page.BorderPage;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.Css;
-import net.sf.clickclick.util.Javascript;
public class DialogDemo extends BorderPage {
@@ -28,15 +28,15 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = getAdvancedPageImports();
+ PageImports pageImports = getPageImports();
Map model = new HashMap();
String javascript =
getContext().renderTemplate("controls/dialog-demo.js", model);
- Javascript jsInclude = new Javascript(javascript);
+ JsScript jsInclude = new JsScript(javascript);
pageImports.add(jsInclude);
String css = getContext().renderTemplate("controls/dialog-demo.css",
model);
- Css cssInclude = new Css(css);
+ CssStyle cssInclude = new CssStyle(css);
pageImports.add(cssInclude);
return null;
Index: jquery-examples/webapp/WEB-INF/web.xml
===================================================================
--- jquery-examples/webapp/WEB-INF/web.xml (revision 244)
+++ jquery-examples/webapp/WEB-INF/web.xml (working copy)
@@ -5,13 +5,13 @@
version="2.4">
<servlet>
- <servlet-name>ClickServlet</servlet-name>
-
<servlet-class>org.apache.click.ClickClickServlet</servlet-class>
+ <servlet-name>ClickClickServlet</servlet-name>
+
<servlet-class>net.sf.clickclick.ClickClickServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>ClickServlet</servlet-name>
+ <servlet-name>ClickClickServlet</servlet-name>
<url-pattern>*.htm</url-pattern>
</servlet-mapping>
Index:
mootools-examples/src/net/sf/clickclick/examples/mootools/page/ajax/FormDemo.java
===================================================================
---
mootools-examples/src/net/sf/clickclick/examples/mootools/page/ajax/FormDemo.java
(revision 244)
+++
mootools-examples/src/net/sf/clickclick/examples/mootools/page/ajax/FormDemo.java
(working copy)
@@ -2,9 +2,11 @@
import java.util.HashMap;
import java.util.Map;
-import net.sf.click.util.AjaxAdapter;
+import net.sf.clickclick.util.AjaxAdapter;
import org.apache.click.Context;
import org.apache.click.Control;
+import org.apache.click.element.CssStyle;
+import org.apache.click.element.JsScript;
import org.apache.click.control.Checkbox;
import org.apache.click.control.Option;
import org.apache.click.control.Select;
@@ -12,12 +14,10 @@
import org.apache.click.control.TextField;
import org.apache.click.extras.control.EmailField;
import org.apache.click.util.HtmlStringBuffer;
-import net.sf.click.util.Partial;
+import org.apache.click.util.PageImports;
+import net.sf.clickclick.util.Partial;
import net.sf.clickclick.examples.mootools.page.BorderPage;
import net.sf.clickclick.mootools.controls.MTAjaxForm;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.Css;
-import net.sf.clickclick.util.Javascript;
public class FormDemo extends BorderPage {
@@ -68,7 +68,7 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = getAdvancedPageImports();
+ PageImports pageImports = getPageImports();
Map model = new HashMap();
Context context = getContext();
@@ -76,10 +76,10 @@
model.put("context", contextPath);
String cssTemplate = "/ajax/form-demo.css";
- pageImports.add(new Css(context.renderTemplate(cssTemplate, model)));
+ pageImports.add(new CssStyle(context.renderTemplate(cssTemplate,
model)));
String jsTemplate = "/ajax/form-demo.js";
- pageImports.add(new Javascript(context.renderTemplate(jsTemplate,
model)));
+ pageImports.add(new JsScript(context.renderTemplate(jsTemplate,
model)));
return null;
}
Index:
mootools-examples/src/net/sf/clickclick/examples/mootools/page/BorderPage.java
===================================================================
---
mootools-examples/src/net/sf/clickclick/examples/mootools/page/BorderPage.java
(revision 244)
+++
mootools-examples/src/net/sf/clickclick/examples/mootools/page/BorderPage.java
(working copy)
@@ -2,7 +2,6 @@
import org.apache.click.extras.control.Menu;
import org.apache.click.util.ClickUtils;
-import net.sf.clickclick.util.AdvancedPageImports;
public class BorderPage extends BasePage {
@@ -20,10 +19,6 @@
addModel("srcPath", srcPath);
}
- public AdvancedPageImports getAdvancedPageImports() {
- return (AdvancedPageImports) getPageImports();
- }
-
/**
* @see #getTemplate()
*/
Index: mootools-examples/webapp/WEB-INF/web.xml
===================================================================
--- mootools-examples/webapp/WEB-INF/web.xml (revision 244)
+++ mootools-examples/webapp/WEB-INF/web.xml (working copy)
@@ -2,13 +2,13 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
<servlet>
- <servlet-name>ClickServlet</servlet-name>
-
<servlet-class>org.apache.click.ClickClickServlet</servlet-class>
+ <servlet-name>ClickClickServlet</servlet-name>
+
<servlet-class>net.sf.clickclick.ClickClickServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>ClickServlet</servlet-name>
+ <servlet-name>ClickClickServlet</servlet-name>
<url-pattern>*.htm</url-pattern>
</servlet-mapping>
Index: jquery/src/net/sf/clickclick/jquery/util/JQAjaxPartial.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/util/JQAjaxPartial.java (revision 244)
+++ jquery/src/net/sf/clickclick/jquery/util/JQAjaxPartial.java (working copy)
@@ -18,7 +18,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.click.Context;
-import net.sf.click.util.Partial;
+import net.sf.clickclick.util.Partial;
/**
*
Index: jquery/src/net/sf/clickclick/jquery/controls/JQActionButton.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/controls/JQActionButton.java
(revision 244)
+++ jquery/src/net/sf/clickclick/jquery/controls/JQActionButton.java
(working copy)
@@ -17,13 +17,13 @@
import java.util.HashMap;
import java.util.Map;
-import net.sf.click.AjaxListener;
+import net.sf.clickclick.AjaxListener;
import org.apache.click.Context;
import org.apache.click.Page;
import net.sf.clickclick.control.ajax.AjaxActionButton;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.JavascriptImport;
-import net.sf.clickclick.util.Javascript;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
+import org.apache.click.element.JsScript;
/**
*
@@ -77,11 +77,11 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
Context context = getContext();
String contextPath = context.getRequest().getContextPath();
- JavascriptImport jsImport = new JavascriptImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js");
+ JsImport jsImport = new JsImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js");
pageImports.add(jsImport);
Page page = getPage();
@@ -97,11 +97,11 @@
model.put("busyIndicatorMessage", getBusyMessage());
String include =
getContext().renderTemplate("/clickclick/jquery/action/jq-action-button.js",
model);
- Javascript jsInclude = new Javascript(include);
+ JsScript jsInclude = new JsScript(include);
pageImports.add(jsInclude);
if (isShowBusyIndicator()) {
- jsImport = new JavascriptImport(contextPath +
"/clickclick/jquery/blockui/jquery.blockUI.js");
+ jsImport = new JsImport(contextPath +
"/clickclick/jquery/blockui/jquery.blockUI.js");
pageImports.add(jsImport);
}
return null;
Index: jquery/src/net/sf/clickclick/jquery/controls/JQDialog.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/controls/JQDialog.java (revision 244)
+++ jquery/src/net/sf/clickclick/jquery/controls/JQDialog.java (working copy)
@@ -1,9 +1,10 @@
package net.sf.clickclick.jquery.controls;
import net.sf.clickclick.control.html.Div;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.CssImport;
-import net.sf.clickclick.util.JavascriptImport;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
+import org.apache.click.element.JsScript;
+import org.apache.click.element.CssImport;
/**
*
@@ -21,9 +22,9 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
String contextPath = getContext().getRequest().getContextPath();
- CssImport cssImport = new CssImport(contextPath
+ CssImport cssImport = new CssImport(contextPath
+ "/clickclick/jquery/ui/flora.dialog.css");
cssImport.setAttribute("media", "screen");
pageImports.add(cssImport);
@@ -33,23 +34,23 @@
cssImport.setAttribute("media", "screen");
pageImports.add(cssImport);
- JavascriptImport jsImport = new JavascriptImport(contextPath
+ JsImport jsImport = new JsImport(contextPath
+ "/clickclick/jquery/jquery-1.2.6.js");
pageImports.add(jsImport);
- jsImport = new JavascriptImport(contextPath
+ jsImport = new JsImport(contextPath
+ "/clickclick/jquery/ui/ui.core.js");
pageImports.add(jsImport);
- jsImport = new JavascriptImport(contextPath
+ jsImport = new JsImport(contextPath
+ "/clickclick/jquery/ui/ui.draggable.js");
pageImports.add(jsImport);
- jsImport = new JavascriptImport(contextPath
+ jsImport = new JsImport(contextPath
+ "/clickclick/jquery/ui/ui.resizable.js");
pageImports.add(jsImport);
- jsImport = new JavascriptImport(contextPath
+ jsImport = new JsImport(contextPath
+ "/clickclick/jquery/ui/ui.dialog.js");
pageImports.add(jsImport);
return null;
Index: jquery/src/net/sf/clickclick/jquery/controls/JQForm.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/controls/JQForm.java (revision 244)
+++ jquery/src/net/sf/clickclick/jquery/controls/JQForm.java (working copy)
@@ -23,9 +23,9 @@
import net.sf.clickclick.control.ajax.AjaxForm;
import org.apache.click.util.ClickUtils;
import org.apache.click.util.HtmlStringBuffer;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.JavascriptImport;
-import net.sf.clickclick.util.Javascript;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
+import org.apache.click.element.JsScript;
/**
*
@@ -57,7 +57,7 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
Context context = getContext();
String contextPath = context.getRequest().getContextPath();
Map model = new HashMap();
@@ -66,12 +66,12 @@
model.put("dataType", getDataType());
model.put("formId", getId());
- pageImports.add(new
Javascript(context.renderTemplate("/clickclick/jquery/form/jq-form.js",
model)));
+ pageImports.add(new
JsScript(context.renderTemplate("/clickclick/jquery/form/jq-form.js", model)));
- pageImports.add(new JavascriptImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js"));
- pageImports.add(new JavascriptImport(contextPath +
"/clickclick/jquery/form/jquery.form.js"));
+ pageImports.add(new JsImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js"));
+ pageImports.add(new JsImport(contextPath +
"/clickclick/jquery/form/jquery.form.js"));
- pageImports.add(new JavascriptImport(contextPath +
"/clickclick/jquery/blockui/jquery.blockUI.js"));
+ pageImports.add(new JsImport(contextPath +
"/clickclick/jquery/blockui/jquery.blockUI.js"));
return super.getHtmlImports();
}
Index: jquery/src/net/sf/clickclick/jquery/controls/JQColorPicker.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/controls/JQColorPicker.java
(revision 244)
+++ jquery/src/net/sf/clickclick/jquery/controls/JQColorPicker.java
(working copy)
@@ -6,11 +6,12 @@
import org.apache.click.control.TextField;
import org.apache.click.util.HtmlStringBuffer;
import net.sf.clickclick.control.html.Div;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.CssImport;
-import net.sf.clickclick.util.Css;
-import net.sf.clickclick.util.JavascriptImport;
-import net.sf.clickclick.util.Javascript;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
+import org.apache.click.element.JsScript;
+import org.apache.click.element.CssImport;
+import org.apache.click.element.CssStyle;
+
/**
*
@@ -33,7 +34,7 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
Context context = getContext();
String contextPath = context.getRequest().getContextPath();
@@ -41,10 +42,10 @@
pageImports.add(new CssImport(resource));
resource = contextPath + "/clickclick/jquery/jquery-1.2.6.js";
- pageImports.add(new JavascriptImport(resource));
+ pageImports.add(new JsImport(resource));
resource = contextPath +
"/clickclick/jquery/colorpicker/js/colorpicker.js";
- pageImports.add(new JavascriptImport(resource));
+ pageImports.add(new JsImport(resource));
Map model = new HashMap();
model.put("fieldId", getId());
@@ -52,11 +53,11 @@
model.put("context", contextPath);
String include =
getContext().renderTemplate("/clickclick/jquery/colorpicker/jq-color-picker.js",
model);
- Javascript jsInclude = new Javascript(include);
+ JsScript jsInclude = new JsScript(include);
pageImports.add(jsInclude);
String style =
getContext().renderTemplate("/clickclick/jquery/colorpicker/jq-color-picker.css",
model);
- Css cssInclude = new Css(style);
+ CssImport cssInclude = new CssImport(style);
pageImports.add(cssInclude);
return null;
}
Index: jquery/src/net/sf/clickclick/jquery/controls/JQActionLink.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/controls/JQActionLink.java
(revision 244)
+++ jquery/src/net/sf/clickclick/jquery/controls/JQActionLink.java
(working copy)
@@ -17,13 +17,13 @@
import java.util.HashMap;
import java.util.Map;
-import net.sf.click.AjaxListener;
+import net.sf.clickclick.AjaxListener;
import org.apache.click.Context;
import org.apache.click.Page;
import net.sf.clickclick.control.ajax.AjaxActionLink;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.JavascriptImport;
-import net.sf.clickclick.util.Javascript;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
+import org.apache.click.element.JsScript;
/**
*
@@ -77,11 +77,11 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
Context context = getContext();
String contextPath = context.getRequest().getContextPath();
- JavascriptImport jsImport = new JavascriptImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js");
+ JsImport jsImport = new JsImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js");
pageImports.add(jsImport);
Page page = getPage();
@@ -97,11 +97,11 @@
model.put("busyIndicatorMessage", getBusyMessage());
String include =
getContext().renderTemplate("/clickclick/jquery/action/jq-action-link.js",
model);
- Javascript jsInclude = new Javascript(include);
+ JsScript jsInclude = new JsScript(include);
pageImports.add(jsInclude);
if (isShowBusyIndicator()) {
- jsImport = new JavascriptImport(contextPath +
"/clickclick/jquery/blockui/jquery.blockUI.js");
+ jsImport = new JsImport(contextPath +
"/clickclick/jquery/blockui/jquery.blockUI.js");
pageImports.add(jsImport);
}
return null;
Index: jquery/src/net/sf/clickclick/jquery/controls/JQMenu.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/controls/JQMenu.java (revision 244)
+++ jquery/src/net/sf/clickclick/jquery/controls/JQMenu.java (working copy)
@@ -7,10 +7,10 @@
import org.apache.click.extras.control.Menu;
import org.apache.click.util.HtmlStringBuffer;
import net.sf.clickclick.control.menu.FlexiMenu;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.CssImport;
-import net.sf.clickclick.util.JavascriptImport;
-import net.sf.clickclick.util.Javascript;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
+import org.apache.click.element.JsScript;
+import org.apache.click.element.CssImport;
import org.apache.commons.lang.ClassUtils;
/**
@@ -45,7 +45,7 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
Context context = getContext();
String contextPath = context.getRequest().getContextPath();
@@ -60,25 +60,25 @@
}
resource = contextPath + "/clickclick/jquery/jquery-1.2.6.js";
- pageImports.add(new JavascriptImport(resource));
+ pageImports.add(new JsImport(resource));
resource = contextPath +
"/clickclick/jquery/superfish/js/hoverIntent.js";
- pageImports.add(new JavascriptImport(resource));
+ pageImports.add(new JsImport(resource));
resource = contextPath +
"/clickclick/jquery/superfish/js/bgiframe.js";
- pageImports.add(new JavascriptImport(resource));
+ pageImports.add(new JsImport(resource));
resource = contextPath +
"/clickclick/jquery/superfish/js/superfish.js";
- pageImports.add(new JavascriptImport(resource));
+ pageImports.add(new JsImport(resource));
Map model = new HashMap();
model.put("options", getOptions());
String include =
getContext().renderTemplate("/clickclick/jquery/superfish/jq-menu.js", model);
- Javascript jsInclude = new Javascript(include);
+ JsScript jsInclude = new JsScript(include);
// Script must be unique as multiple menus can be included on Page
// using the same script. No need to include the script twice.
@@ -111,11 +111,11 @@
if (child.getChildren().size() == 0) {
buffer.closeTag();
buffer.append("\n");
- renderMenuItem(buffer, child);
+ renderMenu(buffer, child);
} else {
buffer.closeTag();
buffer.append("\n");
- renderMenuItem(buffer, child);
+ renderMenu(buffer, child);
buffer.elementStart("ul");
buffer.closeTag();
buffer.append("\n");
Index: jquery/src/net/sf/clickclick/jquery/controls/JQSelect.java
===================================================================
--- jquery/src/net/sf/clickclick/jquery/controls/JQSelect.java (revision 244)
+++ jquery/src/net/sf/clickclick/jquery/controls/JQSelect.java (working copy)
@@ -15,10 +15,11 @@
*/
package net.sf.clickclick.jquery.controls;
-import org.apache.click.AjaxControlRegistry;
+import net.sf.clickclick.AjaxControlRegistry;
import org.apache.click.control.Select;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.JavascriptImport;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
+import org.apache.click.element.JsScript;
/**
*
@@ -50,9 +51,9 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
String contextPath = getContext().getRequest().getContextPath();
- JavascriptImport jsImport = new JavascriptImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js");
+ JsImport jsImport = new JsImport(contextPath +
"/clickclick/jquery/jquery-1.2.6.js");
pageImports.add(jsImport);
return null;
}
Index: mootools/src/net/sf/clickclick/mootools/controls/MTAjaxForm.java
===================================================================
--- mootools/src/net/sf/clickclick/mootools/controls/MTAjaxForm.java
(revision 244)
+++ mootools/src/net/sf/clickclick/mootools/controls/MTAjaxForm.java
(working copy)
@@ -1,8 +1,8 @@
package net.sf.clickclick.mootools.controls;
import net.sf.clickclick.control.ajax.AjaxForm;
-import net.sf.clickclick.util.AdvancedPageImports;
-import net.sf.clickclick.util.JavascriptImport;
+import org.apache.click.util.PageImports;
+import org.apache.click.element.JsImport;
/**
*
@@ -19,10 +19,10 @@
}
public String getHtmlImports() {
- AdvancedPageImports pageImports = (AdvancedPageImports)
getPage().getPageImports();
+ PageImports pageImports = getPage().getPageImports();
String contextPath = getContext().getRequest().getContextPath();
- pageImports.add(new JavascriptImport(contextPath +
"/clickclick/mootools/mootools-1.2.js"));
+ pageImports.add(new JsImport(contextPath +
"/clickclick/mootools/mootools-1.2.js"));
return null;
}
