svn commit: r1307321 - /incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java

[yurize]

Author: yurize
Date: Fri Mar 30 09:05:47 2012
New Revision: 1307321

URL: http://svn.apache.org/viewvc?rev=1307321&view=rev
Log:
Revert "Allows #fragments in links. By By Vicente J. Ruiz Jurado 
https://reviews.apache.org/r/4228";
The comment is incorrect. Will be resbmitted with correct comment.

This reverts commit 67cd73cb678ed1c4894f0ff7d26d968d05884a8b.

Modified:
    
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java

Modified: 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java?rev=1307321&r1=1307320&r2=1307321&view=diff
==============================================================================
--- 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java
 (original)
+++ 
incubator/wave/trunk/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java
 Fri Mar 30 09:05:47 2012
@@ -56,11 +56,9 @@ import org.waveprotocol.wave.client.widg
 import org.waveprotocol.wave.client.widget.toolbar.buttons.ToolbarToggleButton;
 import org.waveprotocol.wave.media.model.AttachmentIdGenerator;
 import org.waveprotocol.wave.media.model.AttachmentIdGeneratorImpl;
-import org.waveprotocol.wave.model.document.util.DocHelper;
 import org.waveprotocol.wave.model.document.util.FocusedRange;
 import org.waveprotocol.wave.model.document.util.LineContainers;
 import org.waveprotocol.wave.model.document.util.Point;
-import org.waveprotocol.wave.model.document.util.Range;
 import org.waveprotocol.wave.model.document.util.XmlStringBuilder;
 import org.waveprotocol.wave.model.id.IdGenerator;
 import org.waveprotocol.wave.model.id.WaveId;
@@ -427,27 +425,18 @@ public class EditToolbar {
                   Window.alert("Select some text to create a link.");
                   return;
                 }
+                String rawLinkValue =
+                    Window.prompt("Enter link: URL or Wave ID.", 
WaveRefConstants.WAVE_URI_PREFIX);
+                // user hit "ESC" or "cancel"
+                if (rawLinkValue == null) {
+                  return;
+                }
                 try {
-                  // We try to create a link with the current selection, if 
fails, we ask for a link
-                  Range rg = range.asRange();
-                  String text = DocHelper.getText(editor.getDocument(), 
rg.getStart(), rg.getEnd());
-                  String linkAnnotationValue = Link.normalizeLink(text);
+                  String linkAnnotationValue = 
Link.normalizeLink(rawLinkValue);
                   EditorAnnotationUtil.setAnnotationOverSelection(editor, 
Link.KEY,
                       linkAnnotationValue);
                 } catch (InvalidLinkException e) {
-                  String rawLinkValue =
-                      Window.prompt("Enter link: URL or Wave ID.", 
WaveRefConstants.WAVE_URI_PREFIX);
-                  // user hit "ESC" or "cancel"
-                  if (rawLinkValue == null) {
-                    return;
-                  }
-                  try {
-                    String linkAnnotationValue = 
Link.normalizeLink(rawLinkValue);
-                    EditorAnnotationUtil.setAnnotationOverSelection(editor, 
Link.KEY,
-                        linkAnnotationValue);
-                  } catch (InvalidLinkException e2) {
-                    Window.alert(e2.getLocalizedMessage());
-                  }
+                  Window.alert(e.getLocalizedMessage());
                 }
               }
             });