From 9f94c9d190baf5bccfdccef23a4c11b08f155dfc Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Fri, 5 Dec 2008 10:46:31 +0000
Subject: [PATCH] WebAnalytics added (#2281), layouts fixed (#2260), one
 example + icon.

svn changeset:6091/svn branch:trunk
---
 .../toolkit/demo/sampler/ModeSwitch.java      |   6 +-
 .../demo/sampler/SamplerApplication.java      |  27 ++++++---
 .../toolkit/demo/sampler/WebAnalytics.java    |  50 ++++++++++++++++
 .../blueprints/ProminentPrimaryAction.png     | Bin 4276 -> 8933 bytes
 .../ProminentPrimaryActionExample.java        |   3 +
 .../demo/sampler/gwt/SamplerWidgetSet.gwt.xml |  14 +++++
 .../sampler/gwt/client/SamplerWidgetSet.java  |  28 +++++++++
 .../sampler/gwt/client/ui/IWebAnalytics.java  |  55 ++++++++++++++++++
 8 files changed, 173 insertions(+), 10 deletions(-)
 create mode 100644 src/com/itmill/toolkit/demo/sampler/WebAnalytics.java
 create mode 100644 src/com/itmill/toolkit/demo/sampler/gwt/SamplerWidgetSet.gwt.xml
 create mode 100644 src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java
 create mode 100644 src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IWebAnalytics.java

diff --git a/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java b/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java
index a42ca62064..d662d421c9 100644
--- a/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java
+++ b/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java
@@ -13,10 +13,12 @@ public class ModeSwitch extends CustomComponent {
 
     GridLayout layout = new GridLayout(3, 1);
 
-    HashMap idToButton = new HashMap();
+    HashMap<Object, Button> idToButton = new HashMap<Object, Button>();
     Object mode = null;
 
     public ModeSwitch() {
+        setSizeUndefined();
+        layout.setSizeUndefined();
         setCompositionRoot(layout);
         setStyleName("ModeSwitch");
     }
@@ -64,7 +66,7 @@ public class ModeSwitch extends CustomComponent {
     }
 
     public void removeMode(Object id) {
-        Button b = (Button) idToButton.remove(id);
+        Button b = idToButton.remove(id);
         layout.removeComponent(b);
         updateStyles();
     }
diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
index 34bc8ca932..9792a6524f 100644
--- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
+++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
@@ -43,6 +43,7 @@ import com.itmill.toolkit.ui.Embedded;
 import com.itmill.toolkit.ui.ExpandLayout;
 import com.itmill.toolkit.ui.GridLayout;
 import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Panel;
 import com.itmill.toolkit.ui.SplitPanel;
 import com.itmill.toolkit.ui.Table;
@@ -207,16 +208,20 @@ public class SamplerApplication extends Application {
 
         private SplitPanel mainSplit;
         private Tree navigationTree;
+        // itmill: UA-658457-6
+        private WebAnalytics webAnalytics = new WebAnalytics("UA-658457-6",
+                "none");
 
         SamplerWindow() {
             // Main top/expanded-bottom layout
-            ExpandLayout mainExpand = new ExpandLayout();
+            OrderedLayout mainExpand = new OrderedLayout();
             setLayout(mainExpand);
+            setSizeFull();
             mainExpand.setSizeFull();
 
             // topbar (navigation)
-            ExpandLayout nav = new ExpandLayout(
-                    ExpandLayout.ORIENTATION_HORIZONTAL);
+            OrderedLayout nav = new OrderedLayout(
+                    OrderedLayout.ORIENTATION_HORIZONTAL);
             mainExpand.addComponent(nav);
             nav.setHeight("40px");
             nav.setWidth("100%");
@@ -229,7 +234,10 @@ public class SamplerApplication extends Application {
             nav.addComponent(logo);
             nav.setComponentAlignment(logo, ExpandLayout.ALIGNMENT_LEFT,
                     ExpandLayout.ALIGNMENT_VERTICAL_CENTER);
-            nav.expand(logo);
+            nav.setExpandRatio(logo, 1);
+
+            // invisible analytics -component
+            nav.addComponent(webAnalytics);
 
             // Previous sample
             Button b = createPrevButton();
@@ -242,6 +250,8 @@ public class SamplerApplication extends Application {
             nav.setComponentAlignment(b, ExpandLayout.ALIGNMENT_LEFT,
                     ExpandLayout.ALIGNMENT_VERTICAL_CENTER);
 
+            // "Search" combobox
+            // TODO add input prompt
             Component search = createSearch();
             nav.addComponent(search);
             nav.setComponentAlignment(search, ExpandLayout.ALIGNMENT_LEFT,
@@ -263,14 +273,14 @@ public class SamplerApplication extends Application {
             // Show / hide tree
             Component treeSwitch = createTreeSwitch();
             nav.addComponent(treeSwitch);
-            nav.setComponentAlignment(treeSwitch, ExpandLayout.ALIGNMENT_LEFT,
-                    ExpandLayout.ALIGNMENT_VERTICAL_CENTER);
+            nav.setComponentAlignment(treeSwitch, OrderedLayout.ALIGNMENT_LEFT,
+                    OrderedLayout.ALIGNMENT_VERTICAL_CENTER);
 
             // List/grid/coverflow
             Component mode = createModeSwitch();
             nav.addComponent(mode);
-            nav.setComponentAlignment(mode, ExpandLayout.ALIGNMENT_RIGHT,
-                    ExpandLayout.ALIGNMENT_VERTICAL_CENTER);
+            nav.setComponentAlignment(mode, OrderedLayout.ALIGNMENT_RIGHT,
+                    OrderedLayout.ALIGNMENT_VERTICAL_CENTER);
 
         }
 
@@ -282,6 +292,7 @@ public class SamplerApplication extends Application {
          */
         public void setFeature(Feature f) {
             currentFeature.setValue(f);
+            webAnalytics.trackPageview(getPathFor(f));
         }
 
         /**
diff --git a/src/com/itmill/toolkit/demo/sampler/WebAnalytics.java b/src/com/itmill/toolkit/demo/sampler/WebAnalytics.java
new file mode 100644
index 0000000000..e4ba752ade
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/WebAnalytics.java
@@ -0,0 +1,50 @@
+package com.itmill.toolkit.demo.sampler;
+
+import com.itmill.toolkit.terminal.PaintException;
+import com.itmill.toolkit.terminal.PaintTarget;
+import com.itmill.toolkit.ui.AbstractComponent;
+
+public class WebAnalytics extends AbstractComponent {
+
+    private String trackerId;
+    private String pageId;
+    private String domainName;
+
+    public WebAnalytics(String trackerId) {
+        this.trackerId = trackerId;
+    }
+
+    public WebAnalytics(String trackerId, String domainName) {
+        this(trackerId);
+        this.domainName = domainName;
+    }
+
+    public String getTag() {
+        return "webanalytics";
+    }
+
+    public String getTrackerId() {
+        return trackerId;
+    }
+
+    public String getDomainName() {
+        return domainName;
+    }
+
+    public void trackPageview(String pageId) {
+        this.pageId = pageId;
+        requestRepaint();
+    }
+
+    public void paintContent(PaintTarget target) throws PaintException {
+        super.paintContent(target);
+        target.addAttribute("trackerid", trackerId);
+        if (pageId != null) {
+            target.addAttribute("pageid", pageId);
+        }
+        if (domainName != null) {
+            target.addAttribute("domain", domainName);
+        }
+    }
+
+}
diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.png b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.png
index aacf950aa061050f17ad7acf392925db8003c457..e575afd5e9d8cd0b4eb73e5496352193614cbf91 100644
GIT binary patch
literal 8933
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

literal 4276
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
buZSCsBeMtkB+RZ?3Pf5Odg|q>cJKcOIG#w>

diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
index fb03daaa4d..87a47f33a9 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
@@ -49,6 +49,9 @@ public class ProminentPrimaryActionExample extends OrderedLayout implements
             Button secondary = new Button("Forgot your password?", this);
             secondary.setStyleName(Button.STYLE_LINK);
             vert.addComponent(secondary);
+            vert.setComponentAlignment(secondary,
+                    OrderedLayout.ALIGNMENT_RIGHT,
+                    OrderedLayout.ALIGNMENT_BOTTOM);
         }
 
     }
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/SamplerWidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/sampler/gwt/SamplerWidgetSet.gwt.xml
new file mode 100644
index 0000000000..2f1e02eae5
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/gwt/SamplerWidgetSet.gwt.xml
@@ -0,0 +1,14 @@
+<module>
+	<!-- Inherit the NoEntry version to avoid multiple entrypoints -->
+	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> 
+	
+	<!-- WidgetSet default theme -->	
+	<stylesheet src="sampler/styles.css"/>
+
+	<!-- Tracker -->
+	<script src="http://www.google-analytics.com/ga.js" />
+
+	<!-- Entry point -->
+	<entry-point class="com.itmill.toolkit.demo.sampler.gwt.client.SamplerWidgetSet"/>
+  
+</module>
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java b/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java
new file mode 100644
index 0000000000..0810f0d868
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java
@@ -0,0 +1,28 @@
+package com.itmill.toolkit.demo.sampler.gwt.client;
+
+import com.itmill.toolkit.demo.sampler.gwt.client.ui.IWebAnalytics;
+import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
+import com.itmill.toolkit.terminal.gwt.client.Paintable;
+import com.itmill.toolkit.terminal.gwt.client.UIDL;
+
+public class SamplerWidgetSet extends DefaultWidgetSet {
+
+    public Paintable createWidget(UIDL uidl) {
+        final Class classType = resolveWidgetType(uidl);
+        if (IWebAnalytics.class == classType) {
+            return new IWebAnalytics();
+        } else {
+            return super.createWidget(uidl);
+        }
+    }
+
+    protected Class resolveWidgetType(UIDL uidl) {
+        final String tag = uidl.getTag();
+        if ("webanalytics".equals(tag)) {
+            return IWebAnalytics.class;
+        } else {
+            return super.resolveWidgetType(uidl);
+        }
+    }
+
+}
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IWebAnalytics.java b/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IWebAnalytics.java
new file mode 100644
index 0000000000..aaa9b06759
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IWebAnalytics.java
@@ -0,0 +1,55 @@
+package com.itmill.toolkit.demo.sampler.gwt.client.ui;
+
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.user.client.ui.Widget;
+import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
+import com.itmill.toolkit.terminal.gwt.client.Paintable;
+import com.itmill.toolkit.terminal.gwt.client.UIDL;
+
+public class IWebAnalytics extends Widget implements Paintable {
+
+    public IWebAnalytics() {
+        setElement(Document.get().createDivElement());
+        if (BrowserInfo.get().isIE6()) {
+            getElement().getStyle().setProperty("overflow", "hidden");
+            getElement().getStyle().setProperty("height", "0");
+        }
+    }
+
+    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+        String trackerId = uidl.getStringAttribute("trackerid");
+        String pageId = uidl.getStringAttribute("pageid");
+        String domainName = uidl.getStringAttribute("domain");
+
+        String res = trackPageview(trackerId, pageId, domainName);
+        if (null != res) {
+            ApplicationConnection.getConsole().log(
+                    "WebAnalytics.trackPageview(" + trackerId + "," + pageId
+                            + "," + domainName + ") FAILED: " + res);
+        } else {
+            ApplicationConnection.getConsole().log(
+                    "WebAnalytics.trackPageview(" + trackerId + "," + pageId
+                            + "," + domainName + ") SUCCESS.");
+        }
+    }
+
+    private native String trackPageview(String trackerId, String pageId,
+            String domainName)
+    /*-{
+        try {
+            var pageTracker = $wnd._gat._getTracker(trackerId);
+            if (domainName) {
+                pageTracker._setDomainName(domainName);
+            }
+            if (pageId) {
+                pageTracker._trackPageview(pageId);
+            } else {
+                pageTracker._trackPageview();
+            }
+            return null;
+        } catch(err) {
+            return ""+err;
+        }
+    }-*/;
+}
-- 
2.39.5