[xwiki-notifications] r5179 - in xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search: columns panels

[David Ward]

Author: dward
Date: 2007-09-28 23:42:27 +0200 (Fri, 28 Sep 2007)
New Revision: 5179

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ActionColumn.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/PaginationPanel.java
Log:
- CURRIKI-882
 - No longer use Hyperlink if not changing history

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ActionColumn.java
===================================================================
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ActionColumn.java
      2007-09-28 20:53:10 UTC (rev 5178)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ActionColumn.java
      2007-09-28 21:42:27 UTC (rev 5179)
@@ -22,9 +22,9 @@
  */
 package org.curriki.gwt.client.search.columns;
 
-import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.ClickListener;
 import com.xpn.xwiki.gwt.api.client.Document;
 import org.curriki.gwt.client.Constants;
 import org.curriki.gwt.client.Main;
@@ -60,7 +60,7 @@
         if ((resourceAdder != null) && (cancelListener != null) &&
             (Main.getSingleton().getUser() != null) &&
             
!(Main.getSingleton().getUser().getFullName().equals(Constants.USER_XWIKI_GUEST))){
-            Hyperlink a = new Hyperlink();
+            HTML a = new HTML();
             a.addStyleName("results-action-cell-link");
             a.setHTML(Main.getTranslation("editor.btt_add"));
             a.addClickListener(new AddAsset(value.getFullName()));

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/PaginationPanel.java
===================================================================
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/PaginationPanel.java
    2007-09-28 20:53:10 UTC (rev 5178)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/PaginationPanel.java
    2007-09-28 21:42:27 UTC (rev 5179)
@@ -23,23 +23,22 @@
 package org.curriki.gwt.client.search.panels;
 
 import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.HTML;
 import org.curriki.gwt.client.Constants;
 import org.curriki.gwt.client.Main;
+import org.curriki.gwt.client.search.history.ClientState;
+import org.curriki.gwt.client.search.history.KeepsState;
 import org.curriki.gwt.client.search.queries.DoesSearch;
 import org.curriki.gwt.client.search.queries.Paginator;
-import org.curriki.gwt.client.search.history.KeepsState;
-import org.curriki.gwt.client.search.history.ClientState;
 
 public class PaginationPanel extends VerticalPanel implements Paginator, 
KeepsState
 {
-    protected Hyperlink prev = new Hyperlink();
-    protected Hyperlink next = new Hyperlink();
+    protected Label prev = new Label();
+    protected Label next = new Label();
     protected boolean canPrevious = false;
     protected boolean canNext = false;
     protected DoesSearch searcher;
@@ -107,8 +106,8 @@
             if (newstart > lastindex){
                 newstart = lastindex;
             }
-        } else if ((sender != prev) && (sender != next) && (sender instanceof 
Hyperlink)) {
-            Hyperlink sPage = (Hyperlink) sender;
+        } else if ((sender != prev) && (sender != next) && (sender instanceof 
Label)) {
+            Label sPage = (Label) sender;
             try {
                 int fromText = Integer.parseInt(sPage.getText());
 
@@ -170,7 +169,7 @@
             int pPage = (pageOffset*10) + i;
             if (pPage <= pagecount){
                 String pPageString = (new Integer(pPage)).toString();
-                Hyperlink n = new Hyperlink();
+                Label n = new Label();
                 n.setText(pPageString);
                 n.setTitle(Main.getTranslation("search.nav.page")+" 
"+pPageString);
                 n.addStyleName("pagination-item");

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications