Projects >> rstudio >>0fd7c34cce643c6157d61da00aab7b2d77e7a204

Chunk
Conflicting content 
                         int sourceLine,
                         String format,
                         String encoding,
<<<<<<< HEAD
                         boolean asShiny)
=======
                         boolean asTempfile)
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
   {
      sourceFile_ = sourceFile;
      sourceLine_ = sourceLine;
Solution content 
                         int sourceLine,
                         String format,
                         String encoding,
                         boolean asTempfile,
                         boolean asShiny)
   {
      sourceFile_ = sourceFile;
      sourceLine_ = sourceLine;
File
RenderRmdEvent.java
Developer's decision
Manual
Kind of conflict
Variable
Chunk
Conflicting content 
      sourceLine_ = sourceLine;
      format_ = format;
      encoding_ = encoding;
<<<<<<< HEAD
      asShiny_ = asShiny;
=======
      asTempfile_ = asTempfile;
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
   }

   public String getSourceFile()
Solution content 
      sourceLine_ = sourceLine;
      format_ = format;
      encoding_ = encoding;
      asTempfile_ = asTempfile;
      asShiny_ = asShiny;
   }

   public String getSourceFile()
File
RenderRmdEvent.java
Developer's decision
Concatenation
Kind of conflict
Variable
Chunk
Conflicting content 
   private final int sourceLine_;
   private final String format_;
   private final String encoding_;
<<<<<<< HEAD
   private final boolean asShiny_;
=======
   private final boolean asTempfile_;
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41

   public static final Type TYPE = new Type();
}
Solution content 
   private final int sourceLine_;
   private final String format_;
   private final String encoding_;
   private final boolean asTempfile_;
   private final boolean asShiny_;

   public static final Type TYPE = new Type();
}
File
RenderRmdEvent.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
         ServerRequestCallback requestCallback);
   
   void renderRmd(String file, int line, String format, String encoding,
<<<<<<< HEAD
                  boolean asShiny, 
=======
                  boolean asTempfile,
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
                  ServerRequestCallback requestCallback);
   
   void renderRmdSource(String source,
Solution content 
         ServerRequestCallback requestCallback);
   
   void renderRmd(String file, int line, String format, String encoding,
                  boolean asTempfile, boolean asShiny,
                  ServerRequestCallback requestCallback);
   
   void renderRmdSource(String source,
File
RMarkdownServerOperations.java
Developer's decision
Concatenation
Kind of conflict
Variable
Chunk
Conflicting content 
   
   private void onClose() 
   {
<<<<<<< HEAD
=======
      // record scroll position and anchor (but try/catch because sometimes 
      // the document is null at this point)
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
      try
      {
         params_.setScrollPosition(view_.getScrollPosition());
Solution content 
   
   private void onClose() 
   {
      // record scroll position and anchor (but try/catch because sometimes 
      // the document is null at this point)
      try
      {
         params_.setScrollPosition(view_.getScrollPosition());
File
RmdOutputPresenter.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
         params_.setScrollPosition(view_.getScrollPosition());
         params_.setAnchor(view_.getAnchor());
      }
<<<<<<< HEAD
      catch (Exception e)
      {
         // the above can fail with a security exception if the view is pointed
         // to a URL on a different domain; in this case we'll just live without
         // persisted positions
      }
=======
      catch(Exception ex)
      {
      }
      
      // notify closed
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
      notifyRmdOutputClosed(params_);
   }
Solution content 
   }
   
         params_.setScrollPosition(view_.getScrollPosition());
         params_.setAnchor(view_.getAnchor());
      }
      catch (Exception e)
      {
      }
      
      // notify closed
      notifyRmdOutputClosed(params_);
File
RmdOutputPresenter.java
Developer's decision
Combination
Kind of conflict
Catch clause
Comment
Chunk
Conflicting content 
   }

   @Override
<<<<<<< HEAD
   public void renderRmd(String file, int line, String format, String encoding, 
         boolean asShiny, ServerRequestCallback requestCallback)
=======
   public void renderRmd(String file, int line, String format, String encoding,
                         boolean asTempfile,
         ServerRequestCallback requestCallback)
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
   {
      JSONArray params = new JSONArray();
      params.set(0, new JSONString(file));
Solution content 
   }

   @Override
   public void renderRmd(String file, int line, String format, String encoding,
                         boolean asTempfile, boolean asShiny,
         ServerRequestCallback requestCallback)
   {
      JSONArray params = new JSONArray();
      params.set(0, new JSONString(file));
File
RemoteServer.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
      params.set(1, new JSONNumber(line));
      params.set(2, new JSONString(StringUtil.notNull(format)));
      params.set(3, new JSONString(encoding));
<<<<<<< HEAD
      params.set(4, JSONBoolean.getInstance(asShiny));
=======
      params.set(4, JSONBoolean.getInstance(asTempfile));
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
      sendRequest(RPC_SCOPE,
            RENDER_RMD,
            params,
Solution content 
      params.set(1, new JSONNumber(line));
      params.set(2, new JSONString(StringUtil.notNull(format)));
      params.set(3, new JSONString(encoding));
      params.set(4, JSONBoolean.getInstance(asTempfile));
      params.set(5, JSONBoolean.getInstance(asShiny));
      sendRequest(RPC_SCOPE,
            RENDER_RMD,
            params,
File
RemoteServer.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
   }

   @Override
<<<<<<< HEAD
=======
   public void onRenderRmd(RenderRmdEvent event)
   {
      server_.renderRmd(event.getSourceFile(), 
                        event.getSourceLine(),
                        event.getFormat(),
                        event.getEncoding(),
                        event.asTempfile(),
            new SimpleRequestCallback());
   }
   
   @Override
   public void onRenderRmdSource(RenderRmdSourceEvent event)
   {
      server_.renderRmdSource(event.getSource(),
                              new SimpleRequestCallback()); 
   }

   @Override
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
   public void onRmdRenderStarted(RmdRenderStartedEvent event)
   {
      switchToConsoleAfterRender_ = !view_.isEffectivelyVisible();
Solution content 
   }

   @Override
   public void onRmdRenderStarted(RmdRenderStartedEvent event)
   {
      switchToConsoleAfterRender_ = !view_.isEffectivelyVisible();
File
RenderRmdOutputPresenter.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
                  docUpdateSentinel_.getPath(),
                  docDisplay_.getCursorPosition().getRow() + 1,
                  null,
<<<<<<< HEAD
                  docUpdateSentinel_.getEncoding(), 
                  false);
=======
                  docUpdateSentinel_.getEncoding(),
                  asTempfile);
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
            }
         });
      }
Solution content 
                  docUpdateSentinel_.getPath(),
                  docDisplay_.getCursorPosition().getRow() + 1,
                  null,
                  docUpdateSentinel_.getEncoding(),
                  asTempfile,
                  false);
            }
         });
      }
File
TextEditingTarget.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
      eventBus_.fireEvent(new RenderRmdEvent(sourceDoc.getPath(), 
                                             1, 
                                             format, 
<<<<<<< HEAD
                                             sourceDoc.getEncoding(), 
=======
                                             sourceDoc.getEncoding(),
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
                                             false));
   }
Solution content 
      eventBus_.fireEvent(new RenderRmdEvent(sourceDoc.getPath(), 
                                             1, 
                                             format, 
                                             sourceDoc.getEncoding(),
                                             false,
                                             false));
   }
File
TextEditingTargetRMarkdownHelper.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
=======
   public void renderRMarkdown(final String sourceFile, 
                               final int sourceLine,
                               final String format,
<<<<<<< HEAD
                               final String encoding, 
                               final boolean asShiny)
                               final String encoding,
                               final boolean asTempfile)
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
   {
      withRMarkdownPackage("Rendering R Markdown documents", 
                           new CommandWithArg() {
Solution content 
   public void renderRMarkdown(final String sourceFile, 
                               final int sourceLine,
                               final String format,
                               final String encoding, 
                               final boolean asTempfile,
                               final boolean asShiny)
   {
      withRMarkdownPackage("Rendering R Markdown documents", 
                           new CommandWithArg() {
File
TextEditingTargetRMarkdownHelper.java
Developer's decision
Manual
Kind of conflict
Variable
Chunk
Conflicting content 
                                                   sourceLine,
                                                   format,
                                                   encoding, 
<<<<<<< HEAD
                                                   asShiny));
=======
                                                   asTempfile));
>>>>>>> 9e7f686146929365c8d5fa48a8c42d6bfc75ff41
         }
      });
   }
Solution content 
                                                   sourceLine,
                                                   format,
                                                   encoding, 
                                                   asTempfile,
                                                   asShiny));
         }
      });
   }
File
TextEditingTargetRMarkdownHelper.java
Developer's decision
Manual
Kind of conflict
Variable