]> source.dussan.org Git - vaadin-framework.git/commitdiff
Removed obsolete code.
authorJani Laakso <jani.laakso@itmill.com>
Wed, 6 Feb 2008 13:03:35 +0000 (13:03 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Wed, 6 Feb 2008 13:03:35 +0000 (13:03 +0000)
svn changeset:3717/svn branch:trunk

13 files changed:
src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
src/com/itmill/toolkit/event/ListenerMethod.java
src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java
src/com/itmill/toolkit/tests/BasicRandomTest.java
src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java
src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
src/com/itmill/toolkit/tests/testbench/TestForUpload.java

index 58264f4da480e72368275164ad5839b5cd2ebe44..a7705775286ba9cad4b6f0dea96c55d5ab0b3789 100644 (file)
@@ -53,9 +53,6 @@ public class ReservationApplication extends Application {
 \r
     private GoogleMap map;\r
 \r
-    private Window popupWindow;\r
-    private Label popupMessage;\r
-\r
     public void init() {\r
         //\r
         db = new SampleDB();\r
index 8d0efd881d40b945630bd2d5eba652410ba6b8ec..25e4a189362c18d7f9da7ca6032d6c3db0f2d523 100644 (file)
@@ -21,7 +21,7 @@ public class ResourceSelectorPanel extends Panel implements
     private final HashMap categoryLayouts = new HashMap();\r
     private final HashMap categoryResources = new HashMap();\r
 \r
-    private Container allResources;\r
+    // private Container allResources;\r
     private LinkedList selectedResources = null;\r
 \r
     public ResourceSelectorPanel(String caption) {\r
@@ -37,8 +37,8 @@ public class ResourceSelectorPanel extends Panel implements
             for (final Iterator it = resources.getItemIds().iterator(); it\r
                     .hasNext();) {\r
                 final Item resource = resources.getItem(it.next());\r
-                final Integer id = (Integer) resource.getItemProperty(\r
-                        SampleDB.Resource.PROPERTY_ID_ID).getValue();\r
+                // final Integer id = (Integer) resource.getItemProperty(\r
+                // SampleDB.Resource.PROPERTY_ID_ID).getValue();\r
                 final String category = (String) resource.getItemProperty(\r
                         SampleDB.Resource.PROPERTY_ID_CATEGORY).getValue();\r
                 final String name = (String) resource.getItemProperty(\r
@@ -97,7 +97,6 @@ public class ResourceSelectorPanel extends Panel implements
         final Object source = event.getSource();\r
         if (source instanceof Button) {\r
             final Object data = ((Button) source).getData();\r
-            final String name = ((Button) source).getCaption();\r
             resetStyles();\r
             if (data instanceof Item) {\r
                 final LinkedList rlist = new LinkedList();\r
index c6619acca9e06f5786be4aa76ecba2bf5bbf45c1..70aaf642de635a372683e8bc6385b2e5723862df 100644 (file)
@@ -86,14 +86,12 @@ public class ICalendarField extends IDateField {
     }\r
 \r
     protected void buildDayView(Date date) {\r
-        boolean firstRender = true;\r
         if (hourPanel == null) {\r
             hourPanel = new SimplePanel();\r
             hourPanel.setStyleName(CLASSNAME + "-hours");\r
             calPanel.getFlexCellFormatter().setColSpan(8, 0, 7);\r
             calPanel.setWidget(8, 0, hourPanel);\r
         } else {\r
-            firstRender = false;\r
             hourPanel.clear();\r
         }\r
         hourTable = new FlexTable();\r
@@ -197,8 +195,8 @@ public class ICalendarField extends IDateField {
     }\r
 \r
     private native void setScrollTop(Element el, int scrollTop) /*-{\r
-                             el.scrollTop = scrollTop;\r
-                           }-*/;\r
+                                   el.scrollTop = scrollTop;\r
+                                 }-*/;\r
 \r
     private class HourTableListener implements TableListener {\r
 \r
@@ -218,7 +216,7 @@ public class ICalendarField extends IDateField {
 \r
         public void addItem(UIDL item) {\r
             final String styleName = item.getStringAttribute("styleName");\r
-            final Integer id = new Integer(item.getIntAttribute("id"));\r
+            // final Integer id = new Integer(item.getIntAttribute("id"));\r
             final long start = Long.parseLong(item.getStringAttribute("start"));\r
             final Date startDate = new Date(start);\r
             long end = -1;\r
index 059cab9e366f0f955509545b6709c2cba2c4c608..49be2017f1f2e893e3a60a47945d99db205d424d 100644 (file)
@@ -412,7 +412,6 @@ public class ListenerMethod implements EventListener {
      *                this event will not be passed to the trigger method.
      */
     public void receiveEvent(EventObject event) {
-
         // Only send events supported by the method
         if (eventType.isAssignableFrom(event.getClass())) {
             try {
index 2bd7cee311be672bcffdc08e17b17cfd01b4de89..63d30768cce5f42af500e3b5290241ab92132395 100644 (file)
@@ -441,8 +441,6 @@ public class IFilterSelect extends Composite implements Paintable,
 
     private String lastFilter = "";
 
-    private int totalSuggestions;
-
     private FilterSelectSuggestion currentSuggestion;
 
     private boolean clientSideFiltering;
@@ -546,7 +544,6 @@ public class IFilterSelect extends Composite implements Paintable,
 
         currentSuggestions.clear();
         final UIDL options = uidl.getChildUIDL(0);
-        totalSuggestions = uidl.getIntAttribute("totalitems");
         totalMatches = uidl.getIntAttribute("totalMatches");
 
         String captions = "";
index 4dffae63c70138cd4fb205b9175a3b006bff6926..e1dbf37e43b97452e4c689c7c13f43e038551484 100644 (file)
@@ -6,7 +6,6 @@ package com.itmill.toolkit.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
@@ -44,8 +43,6 @@ public class ITablePaging extends Composite implements Table, Paintable,
 
     private boolean rowHeaders = false;
 
-    private final Map columnOrder = new HashMap();
-
     private ApplicationConnection client;
     private String id;
 
@@ -57,8 +54,6 @@ public class ITablePaging extends Composite implements Table, Paintable,
 
     private int totalRows;
 
-    private final HashMap columnWidths = new HashMap();
-
     private final HashMap visibleColumns = new HashMap();
 
     private int rows;
index 3a1ccfc2a277b82855ea2d9f4a5a27a44a271512..0e041e02d152a90039232d50def2f0a23f000670 100644 (file)
@@ -65,16 +65,16 @@ public class Pattern {
 \r
     private static native JavaScriptObject _createExpression(String pattern,\r
             String flags)/*-{\r
-                                                                return new RegExp(pattern, flags);\r
-                                                                }-*/;\r
+                                                                        return new RegExp(pattern, flags);\r
+                                                                        }-*/;\r
 \r
     private native void _match(String text, List matches)/*-{\r
-                                                                var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
-                                                                var result = text.match(regExp);\r
-                                                                if (result == null) return;\r
-                                                                for (var i=0;i<result.length;i++)\r
-                                                                matches.@java.util.ArrayList::add(Ljava/lang/Object;)(result[i]);\r
-                                                                }-*/;\r
+                                                                        var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
+                                                                        var result = text.match(regExp);\r
+                                                                        if (result == null) return;\r
+                                                                        for (var i=0;i<result.length;i++)\r
+                                                                        matches.@java.util.ArrayList::add(Ljava/lang/Object;)(result[i]);\r
+                                                                        }-*/;\r
 \r
     /**\r
      * Determines wether the specified regular expression is validated by the\r
@@ -155,9 +155,9 @@ public class Pattern {
      * @return\r
      */\r
     public native boolean matches(String text)/*-{\r
-                                                                var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
-                                                                return regExp.test(text);\r
-                                                                }-*/;\r
+                                                                        var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
+                                                                        return regExp.test(text);\r
+                                                                        }-*/;\r
 \r
     /**\r
      * Returns the regular expression for this pattern\r
@@ -165,16 +165,16 @@ public class Pattern {
      * @return\r
      */\r
     public native String pattern()/*-{\r
-                                                                var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
-                                                                return regExp.source;\r
-                                                                }-*/;\r
+                                                                        var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
+                                                                        return regExp.source;\r
+                                                                        }-*/;\r
 \r
     private native void _split(String input, List results)/*-{\r
-                                                                var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
-                                                                var parts = input.split(regExp);\r
-                                                                for (var i=0;i<parts.length;i++)\r
-                                                                results.@java.util.ArrayList::add(Ljava/lang/Object;)(parts[i] );\r
-                                                                }-*/;\r
+                                                                        var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;\r
+                                                                        var parts = input.split(regExp);\r
+                                                                        for (var i=0;i<parts.length;i++)\r
+                                                                        results.@java.util.ArrayList::add(Ljava/lang/Object;)(parts[i] );\r
+                                                                        }-*/;\r
 \r
     /**\r
      * Split an input string by the pattern's regular expression\r
index c0b08fe3945853b7d1592480338c4d2b52961c30..ba01a83087c1a2dd0c1156ea28254f487ac6de49 100644 (file)
@@ -210,7 +210,7 @@ public class BasicRandomTest extends com.itmill.toolkit.Application implements
                         "*", "/", "=", "C" },
                 { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "plus",
                         "minus", "multiple", "divisor", "equals", "clear" } };
-        final String[] randomizedCaptions = { "a", "b", "c", "y", "8", "3" };
+        // final String[] randomizedCaptions = { "a", "b", "c", "y", "8", "3" };
         // String[] randomizedCaptions = { "X" };
         buttonValues = new HashMap();
         for (int i = 0; i > calcValues[0].length; i++) {
index e9db50b6ec319efabcd715a5787a972e261da6c8..d0cd83001fd68ab64c9f199c22ca4bdf93b8a3ca 100644 (file)
@@ -40,8 +40,6 @@ public class FeatureGridLayout extends Feature {
         ap.addField("new line", new Button("New Line", gl, "newLine"));
         ap.addField("space", new Button("Space", gl, "space"));
         propertyPanel.addProperties("GridLayout Features", ap);
-        propertyPanel.getField("height").dependsOn(
-                propertyPanel.getField("add component"));
 
         setJavadocURL("ui/GridLayout.html");
 
index 7e357e0e003e5dbcfe55f219962654fb3bebedd2..b8068a60b62914b43d25152d1b7cad50881540fa 100644 (file)
@@ -46,8 +46,6 @@ public class FeatureWindow extends Feature implements Window.CloseListener {
 
         // Properties
         propertyPanel = new PropertyPanel(demoWindow);
-        propertyPanel.dependsOn(addButton);
-        propertyPanel.dependsOn(removeButton);
         windowProperties = propertyPanel.createBeanPropertySet(new String[] {
                 "width", "height", "name", "theme", "border", "scrollable", });
         windowProperties.replaceWithSelect("border", new Object[] {
index 278ba73af1611c005b81099bd3cbb1f13c9ce56d..81b9289c7de4ae984e97f7c083c34d5e958815ca 100644 (file)
@@ -13,7 +13,6 @@ import com.itmill.toolkit.terminal.DownloadStream;
 import com.itmill.toolkit.terminal.ParameterHandler;
 import com.itmill.toolkit.terminal.URIHandler;
 import com.itmill.toolkit.terminal.gwt.server.ApplicationServlet;
-import com.itmill.toolkit.terminal.gwt.server.WebBrowser;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
 import com.itmill.toolkit.ui.Label;
@@ -24,8 +23,6 @@ import com.itmill.toolkit.ui.Select;
 public class IntroWelcome extends Feature implements URIHandler,
         ParameterHandler {
 
-    private final WebBrowser webBrowser = null;
-
     Panel panel = new Panel();
 
     private static final String WELCOME_TEXT_UPPER = ""
index 9faefae1809085058021142bbcc0c249df1da1b9..d66b5a96aab8b4fc541238adc1d1ace5a03800db 100644 (file)
@@ -119,8 +119,6 @@ public class PropertyPanel extends Panel implements Button.ClickListener,
         formsLayout.addComponent(p);
 
         // Setup buffering
-        setButton.dependsOn(properties);
-        discardButton.dependsOn(properties);
         properties.setWriteThrough(false);
         // TODO change this to false, and test it is suitable for FeatureBrowser
         // demo
index 0a873631f394b9fd554ac09bc1c59cb25af00a01..2c159c6218947c7ec022ec5c0a69eeafe3d11ee7 100644 (file)
@@ -246,8 +246,6 @@ public class TestForUpload extends CustomComponent implements
 
         private File file;
 
-        private FileInputStream stream;
-
         public TmpFileBuffer() {
             final String tempFileName = "upload_tmpfile_"
                     + System.currentTimeMillis();