Don't bind encodings to new documents until they're saved (as opposed…

… to when they are created)
rstudio · Apr 5, 2011 · 88c3680 · 88c3680
1 parent 63f6130
commit 88c3680
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 46 deletions.
diff --git a/src/cpp/session/modules/SessionSource.cpp b/src/cpp/session/modules/SessionSource.cpp
@@ -52,18 +52,15 @@ Error newDocument(const json::JsonRpcRequest& request,
 {
    // params
    std::string type;
-   std::string encoding;
    json::Object properties;
    Error error = json::readParams(request.params,
                                   &type,
-                                  &encoding,
                                   &properties);
    if (error)
       return error ;
 
    // create the new doc and write it to the database
    SourceDocument doc(type) ;
-   doc.setEncoding(encoding);
 
    doc.editProperties(properties);
 

diff --git a/src/gwt/src/org/rstudio/studio/client/common/filetypes/events/OpenSourceFileEvent.java b/src/gwt/src/org/rstudio/studio/client/common/filetypes/events/OpenSourceFileEvent.java
@@ -25,26 +25,9 @@ public class OpenSourceFileEvent extends GwtEvent<OpenSourceFileHandler>
       new GwtEvent.Type<OpenSourceFileHandler>();
 
    public OpenSourceFileEvent(FileSystemItem file, TextFileType fileType)
-   {
-      this(file, fileType, null);
-   }
-
-   public OpenSourceFileEvent(FileSystemItem file,
-                              TextFileType fileType,
-                              String encoding)
    {
       file_ = file;
       fileType_ = fileType;
-
-      if (!StringUtil.isNullOrEmpty(encoding))
-      {
-         encoding_ = encoding;
-      }
-      else
-      {
-         UIPrefs uiPrefs = RStudioGinjector.INSTANCE.getUIPrefs();
-         encoding_ = uiPrefs.defaultEncoding().getValue();
-      }
    }
 
    public FileSystemItem getFile()
@@ -57,11 +40,6 @@ public TextFileType getFileType()
       return fileType_;
    }
 
-   public String getEncoding()
-   {
-      return encoding_;
-   }
-
    @Override
    protected void dispatch(OpenSourceFileHandler handler)
    {
@@ -76,5 +54,4 @@ public GwtEvent.Type<OpenSourceFileHandler> getAssociatedType()
 
    private final FileSystemItem file_;
    private final TextFileType fileType_;
-   private final String encoding_;
 }
diff --git a/src/gwt/src/org/rstudio/studio/client/server/remote/RemoteServer.java b/src/gwt/src/org/rstudio/studio/client/server/remote/RemoteServer.java
@@ -717,14 +717,12 @@ public void setManipulatorValues(JSONObject values,
    }
 
    public void newDocument(String filetype,
-                           String encoding,
                            JsObject properties,
                            ServerRequestCallback<SourceDocument> requestCallback)
    {
       JSONArray params = new JSONArray();
       params.set(0, new JSONString(filetype));
-      params.set(1, new JSONString(StringUtil.notNull(encoding)));
-      params.set(2, new JSONObject(properties));
+      params.set(1, new JSONObject(properties));
       sendRequest(RPC_SCOPE, NEW_DOCUMENT, params, requestCallback);
    }
 

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/source/Source.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/source/Source.java
@@ -171,7 +171,6 @@ public void onViewData(ViewDataEvent event)
          {
             server_.newDocument(
                   FileTypeRegistry.DATAFRAME.getTypeId(),
-                  null,
                   JsObject.createJsObject(),
                   new SimpleRequestCallback<SourceDocument>("Edit Data Frame") {
                      public void onResponseReceived(SourceDocument response)
@@ -277,7 +276,6 @@ public void onShowContent(ShowContentEvent event)
       ContentItem content = event.getContent();
       server_.newDocument(
             FileTypeRegistry.URLCONTENT.getTypeId(),
-            null,
             (JsObject) content.cast(),
             new SimpleRequestCallback<SourceDocument>("Show")
             {
@@ -308,7 +306,6 @@ public void onShowData(ShowDataEvent event)
 
       server_.newDocument(
             FileTypeRegistry.DATAFRAME.getTypeId(),
-            null,
             (JsObject) data.cast(),
             new SimpleRequestCallback<SourceDocument>("Show Data Frame")
             {
@@ -324,17 +321,15 @@ public void onResponseReceived(SourceDocument response)
    @Handler
    public void onNewSourceDoc()
    {
-      newDoc(FileTypeRegistry.R, uiPrefs_.defaultEncoding().getValue(), null);
+      newDoc(FileTypeRegistry.R, null);
    }
 
    private void newDoc(EditableFileType fileType,
-                       String encoding,
                        final CommandWithArg<EditingTarget> executeOnSuccess)
    {
       ensureVisible(true);
       server_.newDocument(
             fileType.getTypeId(),
-            encoding,
             JsObject.createJsObject(),
             new SimpleRequestCallback<SourceDocument>(
                   "Error Creating New Document")
@@ -458,7 +453,7 @@ public void execute()
 
    public void onOpenSourceFile(final OpenSourceFileEvent event)
    {
-      openFile(event.getFile(), event.getFileType(), event.getEncoding());
+      openFile(event.getFile(), event.getFileType());
    }
 
    // top-level wrapper for opening files. takes care of:
@@ -469,14 +464,13 @@ public void onOpenSourceFile(final OpenSourceFileEvent event)
    //  - finally, actually opening the file from the server
    //    via the call to the lower level openFile method
    private void openFile(final FileSystemItem file,
-                         final TextFileType fileType,
-                         final String encoding)
+                         final TextFileType fileType)
    {
       ensureVisible(true);
 
       if (file == null)
       {
-         newDoc(fileType, encoding, null);
+         newDoc(fileType, null);
          return;
       }
 
@@ -505,13 +499,13 @@ else if (file.getLength() > target.getLargeFileSize())
          confirmOpenLargeFile(file,  new Operation() {
             public void execute()
             {
-               openFileFromServer(file, fileType, encoding);
+               openFileFromServer(file, fileType);
             }
          });
       }
       else
       {
-         openFileFromServer(file, fileType, encoding);
+         openFileFromServer(file, fileType);
       }
    }
 
@@ -546,16 +540,15 @@ private void confirmOpenLargeFile(FileSystemItem file,
    }
 
    private void openFileFromServer(final FileSystemItem file,
-                                   final TextFileType fileType,
-                                   String encoding)
+                                   final TextFileType fileType)
    {
       final Command dismissProgress = globalDisplay_.showProgress(
                                                          "Opening file...");
 
       server_.openDocument(
             file.getPath(),
             fileType.getTypeId(),
-            encoding,
+            uiPrefs_.defaultEncoding().getValue(),
             new ServerRequestCallback<SourceDocument>()
             {
                @Override
@@ -671,7 +664,6 @@ public void onInsertSource(final InsertSourceEvent event)
       else
       {
          newDoc(FileTypeRegistry.R,
-                uiPrefs_.defaultEncoding().getValue(),
                 new CommandWithArg<EditingTarget>()
          {
             public void execute(EditingTarget arg)

diff --git a/...wt/src/org/rstudio/studio/client/workbench/views/source/model/SourceServerOperations.java b/...wt/src/org/rstudio/studio/client/workbench/views/source/model/SourceServerOperations.java
@@ -38,7 +38,6 @@ public interface SourceServerOperations
     * have never been saved.
     */
    void newDocument(String fileType,
-                    String encoding,
                     JsObject properties,
                     ServerRequestCallback<SourceDocument> requestCallback);