Removed obsolete code.

svn changeset:3717/svn branch:trunk

13 files changed, 26 insertions, 52 deletions

diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
index 58264f4da4..a770577528 100644
--- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
+++ b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
@@ -53,9 +53,6 @@ public class ReservationApplication extends Application {
 

     private GoogleMap map;

 

-    private Window popupWindow;

-    private Label popupMessage;

-

     public void init() {

         //

         db = new SampleDB();

diff --git a/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java b/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
index 8d0efd881d..25e4a18936 100644
--- a/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
+++ b/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
@@ -21,7 +21,7 @@ public class ResourceSelectorPanel extends Panel implements
     private final HashMap categoryLayouts = new HashMap();

     private final HashMap categoryResources = new HashMap();

 

-    private Container allResources;

+    // private Container allResources;

     private LinkedList selectedResources = null;

 

     public ResourceSelectorPanel(String caption) {

@@ -37,8 +37,8 @@ public class ResourceSelectorPanel extends Panel implements
             for (final Iterator it = resources.getItemIds().iterator(); it

                     .hasNext();) {

                 final Item resource = resources.getItem(it.next());

-                final Integer id = (Integer) resource.getItemProperty(

-                        SampleDB.Resource.PROPERTY_ID_ID).getValue();

+                // final Integer id = (Integer) resource.getItemProperty(

+                // SampleDB.Resource.PROPERTY_ID_ID).getValue();

                 final String category = (String) resource.getItemProperty(

                         SampleDB.Resource.PROPERTY_ID_CATEGORY).getValue();

                 final String name = (String) resource.getItemProperty(

@@ -97,7 +97,6 @@ public class ResourceSelectorPanel extends Panel implements
         final Object source = event.getSource();

         if (source instanceof Button) {

             final Object data = ((Button) source).getData();

-            final String name = ((Button) source).getCaption();

             resetStyles();

             if (data instanceof Item) {

                 final LinkedList rlist = new LinkedList();

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
index c6619acca9..70aaf642de 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
@@ -86,14 +86,12 @@ public class ICalendarField extends IDateField {
     }

 

     protected void buildDayView(Date date) {

-        boolean firstRender = true;

         if (hourPanel == null) {

             hourPanel = new SimplePanel();

             hourPanel.setStyleName(CLASSNAME + "-hours");

             calPanel.getFlexCellFormatter().setColSpan(8, 0, 7);

             calPanel.setWidget(8, 0, hourPanel);

         } else {

-            firstRender = false;

             hourPanel.clear();

         }

         hourTable = new FlexTable();

@@ -197,8 +195,8 @@ public class ICalendarField extends IDateField {
     }

 

     private native void setScrollTop(Element el, int scrollTop) /*-{

-                             el.scrollTop = scrollTop;

-                           }-*/;

+                                   el.scrollTop = scrollTop;

+                                 }-*/;

 

     private class HourTableListener implements TableListener {

 

@@ -218,7 +216,7 @@ public class ICalendarField extends IDateField {
 

         public void addItem(UIDL item) {

             final String styleName = item.getStringAttribute("styleName");

-            final Integer id = new Integer(item.getIntAttribute("id"));

+            // final Integer id = new Integer(item.getIntAttribute("id"));

             final long start = Long.parseLong(item.getStringAttribute("start"));

             final Date startDate = new Date(start);

             long end = -1;

diff --git a/src/com/itmill/toolkit/event/ListenerMethod.java b/src/com/itmill/toolkit/event/ListenerMethod.java
index 059cab9e36..49be2017f1 100644
--- a/src/com/itmill/toolkit/event/ListenerMethod.java
+++ b/src/com/itmill/toolkit/event/ListenerMethod.java
@@ -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 {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
index 2bd7cee311..63d30768cc 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
@@ -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 = "";
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
index 4dffae63c7..e1dbf37e43 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
@@ -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;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java b/src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java
index 3a1ccfc2a2..0e041e02d1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/util/Pattern.java
@@ -65,16 +65,16 @@ public class Pattern {
 

     private static native JavaScriptObject _createExpression(String pattern,

             String flags)/*-{

-                                                    		 return new RegExp(pattern, flags);

-                                                    		 }-*/;

+                                                            		 return new RegExp(pattern, flags);

+                                                            		 }-*/;

 

     private native void _match(String text, List matches)/*-{

-                                                    		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

-                                                    		 var result = text.match(regExp);

-                                                    		 if (result == null) return;

-                                                    		 for (var i=0;i<result.length;i++)

-                                                    		 matches.@java.util.ArrayList::add(Ljava/lang/Object;)(result[i]);

-                                                    		 }-*/;

+                                                            		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

+                                                            		 var result = text.match(regExp);

+                                                            		 if (result == null) return;

+                                                            		 for (var i=0;i<result.length;i++)

+                                                            		 matches.@java.util.ArrayList::add(Ljava/lang/Object;)(result[i]);

+                                                            		 }-*/;

 

     /**

      * Determines wether the specified regular expression is validated by the

@@ -155,9 +155,9 @@ public class Pattern {
      * @return

      */

     public native boolean matches(String text)/*-{

-                                                    		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

-                                                    		 return regExp.test(text);

-                                                    		 }-*/;

+                                                            		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

+                                                            		 return regExp.test(text);

+                                                            		 }-*/;

 

     /**

      * Returns the regular expression for this pattern

@@ -165,16 +165,16 @@ public class Pattern {
      * @return

      */

     public native String pattern()/*-{

-                                                    		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

-                                                    		 return regExp.source;

-                                                    		 }-*/;

+                                                            		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

+                                                            		 return regExp.source;

+                                                            		 }-*/;

 

     private native void _split(String input, List results)/*-{

-                                                    		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

-                                                    		 var parts = input.split(regExp);

-                                                    		 for (var i=0;i<parts.length;i++)

-                                                    		 results.@java.util.ArrayList::add(Ljava/lang/Object;)(parts[i]	);

-                                                    		 }-*/;

+                                                            		 var regExp = this.@com.itmill.toolkit.terminal.gwt.client.util.Pattern::regExp;

+                                                            		 var parts = input.split(regExp);

+                                                            		 for (var i=0;i<parts.length;i++)

+                                                            		 results.@java.util.ArrayList::add(Ljava/lang/Object;)(parts[i]	);

+                                                            		 }-*/;

 

     /**

      * Split an input string by the pattern's regular expression

diff --git a/src/com/itmill/toolkit/tests/BasicRandomTest.java b/src/com/itmill/toolkit/tests/BasicRandomTest.java
index c0b08fe394..ba01a83087 100644
--- a/src/com/itmill/toolkit/tests/BasicRandomTest.java
+++ b/src/com/itmill/toolkit/tests/BasicRandomTest.java
@@ -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++) {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java
index e9db50b6ec..d0cd83001f 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java
@@ -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");
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
index 7e357e0e00..b8068a60b6 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
@@ -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[] {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
index 278ba73af1..81b9289c7d 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
@@ -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 = ""
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java b/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
index 9faefae180..d66b5a96aa 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
@@ -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
diff --git a/src/com/itmill/toolkit/tests/testbench/TestForUpload.java b/src/com/itmill/toolkit/tests/testbench/TestForUpload.java
index 0a873631f3..2c159c6218 100644
--- a/src/com/itmill/toolkit/tests/testbench/TestForUpload.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForUpload.java
@@ -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();