svn commit: r1353674 - in /incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel: impl/edit/EditSession.java view/IntrinsicBlipMetaView.java view/dom/full/BlipMetaViewBuilder.java

[yurize]

Author: yurize
Date: Mon Jun 25 17:29:30 2012
New Revision: 1353674

URL: http://svn.apache.org/viewvc?rev=1353674&view=rev
Log:
Disable buttons while editing (addresses part of WAVE-349). By Vicente J.
Ruiz Jurado.
https://reviews.apache.org/r/5377/

Modified:
    
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java
    
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/IntrinsicBlipMetaView.java
    
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java

Modified: 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java?rev=1353674&r1=1353673&r2=1353674&view=diff
==============================================================================
--- 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java
 (original)
+++ 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java
 Mon Jun 25 17:29:30 2012
@@ -17,7 +17,6 @@
 package org.waveprotocol.wave.client.wavepanel.impl.edit;
 
 import com.google.common.base.Preconditions;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Widget;
 
 import org.waveprotocol.wave.client.common.util.EventWrapper;
@@ -44,6 +43,7 @@ import org.waveprotocol.wave.client.wave
 import org.waveprotocol.wave.client.wavepanel.view.BlipView;
 import 
org.waveprotocol.wave.client.wavepanel.view.IntrinsicBlipMetaView.MenuOption;
 import org.waveprotocol.wave.client.wavepanel.view.dom.ModelAsViewProvider;
+import 
org.waveprotocol.wave.client.wavepanel.view.dom.full.BlipMetaViewBuilder;
 import org.waveprotocol.wave.model.util.CopyOnWriteSet;
 
 /**
@@ -150,6 +150,7 @@ public final class EditSession
 
     // Find the document.
     ContentDocument document = 
documents.get(views.getBlip(blipUi)).getDocument();
+    
blipUi.getMeta().disable(BlipMetaViewBuilder.DISABLED_WHILE_EDITING_MENU_OPTIONS_SET);
     blipUi.getMeta().select(MenuOption.EDIT);
 
     // Create or re-use and editor for it.
@@ -191,6 +192,7 @@ public final class EditSession
       // TODO(user): this does not work if the view has been deleted and
       // detached.
       editing.getMeta().deselect(MenuOption.EDIT);
+      
editing.getMeta().enable(BlipMetaViewBuilder.DISABLED_WHILE_EDITING_MENU_OPTIONS_SET);
       Editor oldEditor = editor;
       BlipView oldEditing = editing;
       editor = null;

Modified: 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/IntrinsicBlipMetaView.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/IntrinsicBlipMetaView.java?rev=1353674&r1=1353673&r2=1353674&view=diff
==============================================================================
--- 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/IntrinsicBlipMetaView.java
 (original)
+++ 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/IntrinsicBlipMetaView.java
 Mon Jun 25 17:29:30 2012
@@ -27,14 +27,14 @@ import java.util.Set;
 public interface IntrinsicBlipMetaView {
 
   enum MenuOption {
-    /** Option to edit this blip. */
-    EDIT,
     /** Option to reply to this blip. */
     REPLY,
     /** Option to delete this blip. */
     DELETE,
     /** Option to link to this blip. */
-    LINK, ;
+    LINK,
+    /** Option to edit this blip. */
+    EDIT,;
   }
 
   /**

Modified: 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java?rev=1353674&r1=1353673&r2=1353674&view=diff
==============================================================================
--- 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java
 (original)
+++ 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java
 Mon Jun 25 17:29:30 2012
@@ -85,6 +85,10 @@ public final class BlipMetaViewBuilder i
 
   public static final String OPTION_ID_ATTRIBUTE = "o";
   public static final String OPTION_SELECTED_ATTRIBUTE = "s";
+  public final static Set<MenuOption> DISABLED_WHILE_EDITING_MENU_OPTIONS_SET 
= EnumSet.of(
+      IntrinsicBlipMetaView.MenuOption.REPLY, 
IntrinsicBlipMetaView.MenuOption.DELETE,
+      IntrinsicBlipMetaView.MenuOption.LINK);
+
 
   static {
     MENU_CODES.put(MenuOption.EDIT, EscapeUtils.fromSafeConstant("e"));
@@ -177,10 +181,12 @@ public final class BlipMetaViewBuilder i
     this.selected.removeAll(options);
   }
 
+  @Override
   public void select(MenuOption option) {
     this.selected.add(option);
   }
 
+  @Override
   public void deselect(MenuOption option) {
     this.selected.remove(option);
   }