merging fixes from 6.5

svn changeset:18407/svn branch:6.6

5 files changed, 19 insertions, 11 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index f892d476cb..9b99391dda 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -228,6 +228,10 @@ public class VTabsheet extends VTabsheetBase {
                         false);
             }
             oldSelected = newSelected;
+
+            // The selected tab might need more (or less) space
+            updateCaptionSize(index);
+            updateCaptionSize(activeTabIndex);
         }
 
         public void removeTab(int i) {
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
index 0504e02787..02218f4bc2 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
@@ -165,9 +165,9 @@ public abstract class AbstractWebApplicationContext implements
 
         final String filename = resource.getFilename();
         if (filename == null) {
-            return "APP/" + mapKey + "/";
+            return "app://APP/" + mapKey + "/";
         } else {
-            return "APP/" + mapKey + "/" + filename;
+            return "app://APP/" + mapKey + "/" + filename;
         }
 
     }
diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 080ff33af5..8b1e776b4c 100644
--- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -371,7 +371,7 @@ public class JsonPaintTarget implements PaintTarget {
                         "Application not specified for resorce "
                                 + value.getClass().getName());
             }
-            final String uri = "app://" + a.getRelativeLocation(r);
+            final String uri = a.getRelativeLocation(r);
             addAttribute(name, uri);
 
         } else if (value instanceof ThemeResource) {
diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index 27682c764d..2ce6294df5 100644
--- a/src/com/vaadin/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -1042,7 +1042,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /**
      * Sets the internal field value. This is purely used by AbstractField to
      * change the internal Field value. It does not trigger valuechange events.
-     * It can be overriden by the inheriting classes to update all dependent
+     * It can be overridden by the inheriting classes to update all dependent
      * variables.
      * 
      * @param newValue
diff --git a/src/com/vaadin/ui/AbstractTextField.java b/src/com/vaadin/ui/AbstractTextField.java
index ad31a46157..693106b686 100644
--- a/src/com/vaadin/ui/AbstractTextField.java
+++ b/src/com/vaadin/ui/AbstractTextField.java
@@ -439,17 +439,23 @@ public abstract class AbstractTextField extends AbstractField implements
 
     private void firePendingTextChangeEvent() {
         if (textChangeEventPending) {
-            fireEvent(new TextChangeEventImpl(this));
             textChangeEventPending = false;
+            fireEvent(new TextChangeEventImpl(this));
         }
     }
 
     @Override
     protected void setInternalValue(Object newValue) {
-        if (changingVariables) {
+        if (changingVariables && !textChangeEventPending) {
             /*
-             * Fire text change event before value change event if change is
-             * coming from the client side.
+             * Fire a "simulated" text change event before value change event if
+             * change is coming from the client side.
+             * 
+             * Iff there is both value change and textChangeEvent in same
+             * variable burst, it is a text field in non immediate mode and the
+             * text change event "flushed" queued value change event. In this
+             * case textChangeEventPending flag is already on and text change
+             * event will be fired after the value change event.
              */
             if (newValue == null && lastKnownTextContent != null
                     && !lastKnownTextContent.equals(getNullRepresentation())) {
@@ -463,9 +469,7 @@ public abstract class AbstractTextField extends AbstractField implements
                 textChangeEventPending = true;
             }
 
-            if (textChangeEventPending) {
-                firePendingTextChangeEvent();
-            }
+            firePendingTextChangeEvent();
         }
         super.setInternalValue(newValue);
     }