Fix samples.

jDramaix · Gerrit Code Review · commit aaf1184a6df6 · 2015-05-15T22:04:18.000Z
- Enable GSS for Mail and showcase samples + finilaze convrsion to gss.
- Change log level in GssResourceGenerator
- Fix bad property in uibinder tests

Change-Id: I564f1d2cb135bc0ad963a566a792e0c0274d0b24
diff --git a/samples/mail/src/com/google/gwt/sample/mail/Mail.gwt.xml b/samples/mail/src/com/google/gwt/sample/mail/Mail.gwt.xml
@@ -20,4 +20,8 @@
   <set-configuration-property name="CssResource.obfuscationPrefix" value="M" />
 
   <entry-point class='com.google.gwt.sample.mail.client.Mail' />
+
+    <set-configuration-property name="CssResource.enableGss" value="true" />
+    <set-configuration-property name="CssResource.gssDefaultInUiBinder" value="true" />
+
 </module>
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/AboutDialog.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/AboutDialog.ui.xml
@@ -4,7 +4,7 @@
 
   <ui:image field='logo' src='gwt-logo.png'/>
 
-  <ui:style gss="true">
+  <ui:style>
   .panel {
     padding: 10px;
   }
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/ContactPopup.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/ContactPopup.ui.xml
@@ -5,7 +5,7 @@
 
   <ui:image field='photo' src='default_photo.jpg'/>
 
-  <ui:style gss="true">
+  <ui:style>
   .popup {
     background: #fff;
     border: 1px solid #666;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Contacts.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/Contacts.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:mail='urn:import:com.google.gwt.sample.mail.client'>
 
-  <ui:style gss="true" field='style'
+  <ui:style field='style'
     type='com.google.gwt.sample.mail.client.Contacts.Style'>
   .contacts {
     padding: 0.5em;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Mail.java b/samples/mail/src/com/google/gwt/sample/mail/client/Mail.java
@@ -21,7 +21,6 @@
 import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.CssResource.NotStrict;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.Window;
@@ -38,8 +37,7 @@ public class Mail implements EntryPoint {
   interface Binder extends UiBinder<DockLayoutPanel, Mail> { }
 
   interface GlobalResources extends ClientBundle {
-    @NotStrict
-    @Source("global.css")
+    @Source("global.gss")
     CssResource css();
   }
 
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.ui.xml
@@ -2,7 +2,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:mail='urn:import:com.google.gwt.sample.mail.client'>
 
-  <ui:style gss="true">
+  <ui:style>
   .detail {
     border: 1px solid #666;
     background-color: white;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/MailList.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/MailList.ui.xml
@@ -5,7 +5,7 @@
 
   <ui:image field='gradient' src='gradient_bg_dark.png' repeatStyle='Horizontal'/>
 
-  <ui:style gss="true">
+  <ui:style>
   .outer {
     border-left: 1px solid #999;
     border-bottom: 1px solid #999;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/NavBar.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/NavBar.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:mail='urn:import:com.google.gwt.sample.mail.client'>
 
-  <ui:style gss="true">
+  <ui:style>
   .anchor {
     margin: 0 8px;
   }
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:mail='urn:import:com.google.gwt.sample.mail.client'>
 
-  <ui:style gss="true">
+  <ui:style>
   .shortcuts {
     border-left: 1px solid #999;
     border-right: 1px solid #999;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Tasks.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/Tasks.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:mail='urn:import:com.google.gwt.sample.mail.client'>
 
-  <ui:style gss="true">
+  <ui:style>
   .tasks {
     padding: 0.5em;
     line-height: 150%;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/TopPanel.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/TopPanel.ui.xml
@@ -8,7 +8,7 @@
 
   <ui:image field='logo' src='logo.png'/>
 
-  <ui:style gss="true">
+  <ui:style>
   .statusDiv {
     text-align: right;
     margin: 1em;
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/global.gss b/samples/mail/src/com/google/gwt/sample/mail/client/global.gss
@@ -1,3 +1,5 @@
+@external 'gwt-*' 'dialog*' Caption;
+
 body, table {
   font-size: small;
 }
@@ -37,7 +39,7 @@ a:link, a:visited, a:hover, a:active {
 .gwt-PopupPanelGlass {
   background-color: #000;
   opacity: 0.3;
-  filter: literal("alpha(opacity=30)");
+  filter: alpha(opacity=30);
   z-index: 2;
 }
 
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/Showcase.gwt.xml b/samples/showcase/src/com/google/gwt/sample/showcase/Showcase.gwt.xml
@@ -29,5 +29,8 @@
   <set-configuration-property name="locale.cookie" value="SHOWCASE_LOCALE"/>
   <set-configuration-property name="locale.useragent" value="Y"/>
 
+  <set-configuration-property name="CssResource.enableGss" value="true" />
+  <set-configuration-property name="CssResource.gssDefaultInUiBinder" value="true" />
+
   <source path="client" />
 </module>
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidgetView.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidgetView.ui.xml
@@ -3,7 +3,7 @@
   xmlns:ui="urn:ui:com.google.gwt.uibinder"
   xmlns:g="urn:import:com.google.gwt.user.client.ui">
 
-  <ui:style gss="true">
+  <ui:style>
     .name {
       color: #4b4a4a;
       font-size: 17pt;
@@ -36,4 +36,4 @@
       ui:field='examplePanel' />
   </g:HeaderPanel>
 
-</ui:UiBinder> 
+</ui:UiBinder> 
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/Showcase.gss b/samples/showcase/src/com/google/gwt/sample/showcase/client/Showcase.gss
@@ -0,0 +1,60 @@
+@external 'cw-*' sc-FixedWidthButton;
+
+/**
+ * Applied to buttons that should have a fixed width.
+ */
+.sc-FixedWidthButton {
+  width: 10em;
+}
+
+/**
+ * Applied to specific components in Content Widgets.
+ */
+.cw-BasicPopup-thumb {
+  cursor: pointer;
+  /* @alternate */ cursor: hand;
+}
+
+.cw-DictionaryExample-header {
+  color: #7aa5d6;
+  text-decoration: underline;
+  font-weight: bold;
+  /* @noflip */padding-right: 20px;
+}
+
+.cw-DictionaryExample-data {
+  /* @noflip */padding-right: 20px;
+}
+
+.cw-DockPanel td {
+  border: 1px solid #BBBBBB;
+  padding: 3px;
+}
+
+.cw-FlexTable td {
+  border: 1px solid #BBBBBB;
+  padding: 3px;
+}
+
+.cw-FlexTable-buttonPanel td {
+  border: 0px;
+}
+
+.cw-FlowPanel-checkBox {
+  margin-right: 20px;
+}
+
+.cw-RedText {
+  color: red;
+}
+
+.cw-RichText {
+  border: 1px solid #BBBBBB;
+  border-spacing: 0px;
+}
+
+.cw-StackPanelHeader {
+  padding-left: 7px;
+  font-weight: bold;
+  font-size: 1.4em;
+}
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/ShowcaseResources.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/ShowcaseResources.java
@@ -17,7 +17,6 @@
 
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.CssResource.NotStrict;
 import com.google.gwt.resources.client.ImageResource;
 
 /**
@@ -43,8 +42,7 @@ public interface ShowcaseResources extends ClientBundle {
   /**
    * The styles used in LTR mode.
    */
-  @NotStrict
-  @Source("Showcase.css")
+  @Source("Showcase.gss")
   CssResource css();
 
   ImageResource gwtLogo();
@@ -61,4 +59,4 @@ public interface ShowcaseResources extends ClientBundle {
    * Indicates the locale selection box.
    */
   ImageResource locale();
-}
+}
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/ShowcaseShell.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/ShowcaseShell.ui.xml
@@ -10,7 +10,7 @@
     field='res'
     type='com.google.gwt.sample.showcase.client.ShowcaseResources' />
 
-  <ui:style gss="true">
+  <ui:style>
     .linkBar {
       padding: 2px 22px 2px 0;
       background: white;
@@ -271,4 +271,4 @@
 
   </g:DockLayoutPanel>
 
-</ui:UiBinder> 
+</ui:UiBinder> 
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/ContactInfoForm.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/ContactInfoForm.ui.xml
@@ -6,7 +6,7 @@
   ui:generateFormat='com.google.gwt.i18n.rebind.format.PropertiesFormat'
   ui:generateLocales='default'>
 
-  <ui:style gss="true">
+  <ui:style>
     .header {
       font-size: 110%;
       font-weight: bold;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellBrowser.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellBrowser.ui.xml
@@ -4,7 +4,7 @@
   xmlns:g="urn:import:com.google.gwt.user.client.ui"
   xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
 
-  <ui:style gss="true">
+  <ui:style>
     .browser {
       height: 200px;
       border: 1px solid #ccc;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellList.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellList.ui.xml
@@ -5,7 +5,7 @@
   xmlns:c='urn:import:com.google.gwt.user.cellview.client'
   xmlns:s="urn:import:com.google.gwt.sample.showcase.client.content.cell">
 
-  <ui:style gss="true">
+  <ui:style>
     .scrollable {
       height: 400px;
       width: 250px;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellSampler.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellSampler.ui.xml
@@ -4,7 +4,7 @@
   xmlns:g="urn:import:com.google.gwt.user.client.ui"
   xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
 
-  <ui:style gss="true">
+  <ui:style>
     .buttonPanel {
       padding: 8px 20px;
       border-top: 1px solid #ccc;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellTable.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellTable.ui.xml
@@ -4,7 +4,7 @@
   xmlns:g="urn:import:com.google.gwt.user.client.ui"
   xmlns:c="urn:import:com.google.gwt.user.cellview.client">
 
-  <ui:style gss="true">
+  <ui:style>
     .cellTable {
       border-bottom: 1px solid #ccc;
       text-align: left;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellTree.ui.xml b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCellTree.ui.xml
@@ -4,7 +4,7 @@
   xmlns:g="urn:import:com.google.gwt.user.client.ui"
   xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
 
-  <ui:style gss="true">
+  <ui:style>
     .tree {
       width: 500px;
       border: 1px solid #ccc;
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCustomDataGrid.gss b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCustomDataGrid.gss
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCustomDataGrid.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/content/cell/CwCustomDataGrid.java
@@ -79,7 +79,7 @@
  * example that shows how to completely customize the appearance of the headers,
  * data rows, and footers in a CellTable.
  */
-@ShowcaseRaw({"ContactDatabase.java", "CwCustomDataGrid.ui.xml", "CwCustomDataGrid.css"})
+@ShowcaseRaw({"ContactDatabase.java", "CwCustomDataGrid.ui.xml", "CwCustomDataGrid.gss"})
 public class CwCustomDataGrid extends ContentWidget {
 
   /**
@@ -120,7 +120,7 @@ interface Resources extends ClientBundle {
     /**
      * Get the styles used but this example.
      */
-    @Source("CwCustomDataGrid.css")
+    @Source("CwCustomDataGrid.gss")
     Styles styles();
   }
 
diff --git a/user/src/com/google/gwt/resources/rg/GssResourceGenerator.java b/user/src/com/google/gwt/resources/rg/GssResourceGenerator.java
@@ -507,7 +507,7 @@ static URL[] findResources(TreeLogger logger, ResourceContext context, JMethod m
           return originalResources;
         }
 
-        logger.log(Type.INFO, "Preferred resource file found: " + preferredFile + ". This file " +
+        logger.log(Type.DEBUG, "Preferred resource file found: " + preferredFile + ". This file " +
             "will be used in replacement of " + original);
 
         resourcesToUse[i] = preferredUrl;
diff --git a/user/test/com/google/gwt/uibinder/test/LazyWidgetBuilderSuite.gwt.xml b/user/test/com/google/gwt/uibinder/test/LazyWidgetBuilderSuite.gwt.xml
@@ -18,5 +18,5 @@
   <set-configuration-property name="UiBinder.useLazyWidgetBuilders" value="true"/>
   <set-configuration-property name="CssResource.enableGss" value="true" />
   <set-configuration-property name="CssResource.conversionMode" value="strict" />
-  <set-configuration-property name="CssResource.gssInUiBinder" value="true" />
+  <set-configuration-property name="CssResource.gssDefaultInUiBinder" value="true" />
 </module>
diff --git a/user/test/com/google/gwt/uibinder/test/UiBinderSuite.gwt.xml b/user/test/com/google/gwt/uibinder/test/UiBinderSuite.gwt.xml
@@ -17,5 +17,5 @@
   <inherits name="com.google.gwt.debug.Debug"/>
   <set-configuration-property name="CssResource.enableGss" value="true" />
   <set-configuration-property name="CssResource.conversionMode" value="strict" />
-  <set-configuration-property name="CssResource.gssInUiBinder" value="true" />
+  <set-configuration-property name="CssResource.gssDefaultInUiBinder" value="true" />
 </module>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`<ui:image field='logo' src='gwt-logo.png'/>`
`6`	`6`
`7`		`- <ui:style gss="true">`
	`7`	`+ <ui:style>`
`8`	`8`	`.panel {`
`9`	`9`	`padding: 10px;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`xmlns:g='urn:import:com.google.gwt.user.client.ui'`
`4`	`4`	`xmlns:mail='urn:import:com.google.gwt.sample.mail.client'>`
`5`	`5`
`6`		`- <ui:style gss="true">`
	`6`	`+ <ui:style>`
`7`	`7`	`.anchor {`
`8`	`8`	`margin: 0 8px;`
`9`	`9`	`}`