Skip to content

Commit

Permalink
fix typos in comments and some literal strings
Browse files Browse the repository at this point in the history
  • Loading branch information
gtritchie committed Aug 23, 2019
1 parent 812bf22 commit f019a00
Show file tree
Hide file tree
Showing 44 changed files with 61 additions and 57 deletions.
6 changes: 5 additions & 1 deletion src/gwt/.idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/gwt/src/org/rstudio/core/client/ColorUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ else if (cssString.startsWith("rgb"))

if (pattern == null)
{
Debug.logToConsole("Non-conformat RGB color string: '" + cssString + "'");
Debug.logToConsole("Non-conformant RGB color string: '" + cssString + "'");
return new RGBColor();
}

Expand Down
2 changes: 1 addition & 1 deletion src/gwt/src/org/rstudio/core/client/MessageDisplay.java
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public void execute()
public void showNotYetImplemented()
{
showMessage(MSG_INFO,
"Not Yet Implemetned",
"Not Yet Implemented",
"This feature has not yet been implemented.");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.google.gwt.event.shared.HandlerRegistration;

/**
* Provides a mechanism for declaritively hooking up command handler methods
* Provides a mechanism for declaratively hooking up command handler methods
* to the relevant commands.
*
* 1) Create a method for each command to be handled. It should have a return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ public void onEnsureHeight(EnsureHeightEvent event)
chromeHeight -
targetHeight;

// see if we need to offset to acheive minimum other height
// see if we need to offset to achieve minimum other height
int offset = 0;
if (otherHeight < MINIMUM)
offset = MINIMUM - otherHeight;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ pre {
right: 0px !important;
bottom: 0px !important;

/* overflow-hidden with border-radius degrates under windows */
/* overflow-hidden with border-radius degrades under windows */
overflow: visible !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ protected ModalDialogBase(DialogRole role)
protected ModalDialogBase(SimplePanel containerPanel, DialogRole role)
{
// core initialization. passing false for modal works around
// modal PopupPanel supressing global keyboard accelerators (like
// modal PopupPanel suppressing global keyboard accelerators (like
// Ctrl-N or Ctrl-T). modality is achieved via setGlassEnabled(true)
super(false, false);
setGlassEnabled(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public void onClick(ClickEvent event) {
@Override
protected Widget createMainWidget()
{
// main widget is scroll panel with embeddeed html
// main widget is scroll panel with embedded html
ScrollPanel scrollPanel = new ScrollPanel();
scrollPanel.setStylePrimaryName(styleName_);
HTML htmlContent = new HTML(content_);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private static native final SuspendOptions create(boolean saveMinimal,
}-*/;

/*
* Indidates that only a minimal amount of session state should be
* Indicates that only a minimal amount of session state should be
* saved (e.g. working directory and up-arrow history).
*
* If this option is true then the save_workspace option will be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private int getPositionAtOffset(int offset)
private int historyPos_ ;
// If you start typing a command, then go up in history, then go down,
// then what you had previously typed should still be there. This is
// that value--it is loaded/saved whenever history nagivation takes you
// that value--it is loaded/saved whenever history navigation takes you
// into/out of that final history position (history_.size()).
private String historyTail_;
private final HasText input_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private boolean handleAskSecret(String targetWindow)
!satelliteManager.satelliteWindowExists(targetWindow))
return true;

// othewise don't handle
// otherwise don't handle
else
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ public Synctex(GlobalDisplay globalDisplay,
prefs_ = prefs;
satellite_ = satellite;

// main window and satellite export callbacks to eachother
// main window and satellite export callbacks to each other
if (!Satellite.isCurrentWindowSatellite())
{
registerMainWindowCallbacks();

eventBus_.addHandler(SynctexEditFileEvent.TYPE, this);
}

// fixup synctex tooltips for macos
// fixup synctex tooltips for macOS
if (BrowseCap.isMacintosh())
fixupSynctexCommandDescription(commands_.synctexSearch());

Expand Down Expand Up @@ -154,13 +154,13 @@ public void enableCommands(boolean enabled)
// confident that it was always correct. we were also globally managing
// the state of the synctex command based on any external viewer closing.
// now that we optionally support desktop viewers for synctex this
// assumption may not hold -- specfically there might be multiple active
// assumption may not hold -- specifically there might be multiple active
// PDF viewers for different document or we might not know that the
// external viewer has closed . we have explicitly chosen to
// avoid the complexity of tracking distinct viewer states. if we want
// to do this we probably should do the following:
//
// - always keep the the syncex command available in all editors
// - always keep the the synctex command available in all editors
// so long as there is at least one preview window alive; OR
//
// - for cases where we do know whether the window is still alive
Expand All @@ -172,7 +172,7 @@ public boolean forwardSearch(final String pdfFile,
{
if (handleDesktopSynctex())
{
// apply concordane
// apply concordance
final ProgressIndicator indicator = getSyncProgress();
server_.applyForwardConcordance(
pdfFile,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private boolean handleAskPass(String targetWindow)
!satelliteManager.satelliteWindowExists(targetWindow))
return true;

// othewise don't handle
// otherwise don't handle
else
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ private void findInTopic(String term, CanFocus findInputSource)
RStudioGinjector.INSTANCE.getGlobalDisplay().showMessage(
MessageDialog.INFO,
"Find in Page",
"No occurences found",
"No occurrences found",
findInputSource);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ public void onOpenProjectNewWindow(OpenProjectNewWindowEvent event)
{
// call the desktop to open the project (since it is
// a conventional foreground gui application it has
// less chance of running afowl of desktop app creation
// less chance of running afoul of desktop app creation
// & activation restrictions)
FileSystemItem project = FileSystemItem.createFile(event.getProject());
if (Desktop.isDesktop())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private void findInTopic(String term, CanFocus findInputSource)
RStudioGinjector.INSTANCE.getGlobalDisplay().showMessage(
MessageDialog.INFO,
"Find in Page",
"No occurences found",
"No occurrences found",
findInputSource);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ else if (type == ClientEvent.ExecuteAppCommand)
}
catch(Throwable e)
{
GWT.log("WARNING: Exception occured dispatching event: " + type, e);
GWT.log("WARNING: Exception occurred dispatching event: " + type, e);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3624,7 +3624,7 @@ private native void performCallback(JavaScriptObject responseCallback,
final ResponseHandler responseHandler = new ResponseHandler();

// setup a retry handler which will call back the second time with
// the same args (but no retryHandler, ensurin at most 1 retry)
// the same args (but no retryHandler, ensuring at most 1 retry)
RetryHandler retryHandler = new RetryHandler() {

public void onRetry()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void attemptToUpdateCredentials()
public void onResponseReceived(Integer response)
{
// this method does nothing in the case of both successfully
// updating credentails and method not found. however, if
// updating credentials and method not found. however, if
// the credentials update fails then it needs to blow
// away the client

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void start()
// receive an event twice (because the reset to -1 causes us to never
// confirm receipt of the event with the server). in practice this
// would a) be very unlikely; b) not be that big of a deal; and c) is
// judged preferrable than doing something more complex in this code
// judged preferable than doing something more complex in this code
// which might avoid dupes but cause other bugs (such as missing events
// from the server). note also that when we go multi-user we'll be
// revisiting this mechanism again so there will be an opportunity to
Expand Down Expand Up @@ -219,7 +219,7 @@ private void listen()
// 1) perpetual "Loading..." indicator displayed to user (user can
// also then "cancel" the event request!); and
//
// 2) terimation of the request without warning by the browser when
// 2) termination of the request without warning by the browser when
// the user hits the Back button within a frame hosted on the page
// (note in this case we get no error so think the request is still
// running -- see Watchdog for workaround to this general class of
Expand Down Expand Up @@ -258,7 +258,7 @@ public void onResponseReceived(JsArray<ClientEvent> events)

try
{
// only processs events if we are still listening
// only process events if we are still listening
if (isListening_ && (events != null))
{
for (int i=0; i<events.length(); i++)
Expand All @@ -270,7 +270,7 @@ public void onResponseReceived(JsArray<ClientEvent> events)
if (!isListening_)
return;

// disppatch event
// dispatch event
ClientEvent event = events.get(i);
dispatchEvent(event);
lastEventId_ = event.getId();
Expand Down Expand Up @@ -410,7 +410,7 @@ private void dispatchEvent(ClientEvent event)
// NOTE: the design of the Watchdog likely results in more restarts of
// the event service than is optimal. when an rpc call reports that
// events are pending and the Watchdog is invoked it is very likely
// that the events have already been delievered in response to the
// that the events have already been delivered in response to the
// previous poll. In this case the Watchdog "misses" those events which
// were already delivered and subsequently assumes that the service
// needs to be restarted
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void onFocus(FocusEvent event)
@Override
public void onFileChange(FileChangeEvent event)
{
// if this was an R file then invalide the cache
// if this was an R file then invalidate the cache
CodeSearchOracle oracle = display_.getSearchOracle();
if (oracle.hasCachedResults())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public void onResizingCompleted()
initialWidth = constrainWidth(initialWidth);
initialHeight = constrainHeight(initialHeight);

// initialie text boxes
// initialize text boxes
setWidthTextBox(initialWidth);
setHeightTextBox(initialHeight);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ public PrefValue<Boolean> warnVariableDefinedButNotUsed()
}

/**
* Whether to automatically discover and offer to install missing R package dependenices.
* Whether to automatically discover and offer to install missing R package dependencies.
*/
public PrefValue<Boolean> autoDiscoverPackageDependencies()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public final boolean validateAndAutoCorrect()
replaceObsoleteTabs(ts2);

// Presentation tab must always be at the end of the ts1 tabset (this
// is so that activating it works even in the presense of optionally
// is so that activating it works even in the presence of optionally
// visible tabs). This is normally an invariant but for a time during
// the v0.99-1000 preview we allowed the Connections tab to be the
// last one in the tabset.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ private void showError(String errorMessage)

public void onNewConnection()
{
// if r session bussy, fail
// if r session busy, fail
if (commands_.interruptR().isEnabled()) {
showError(
"The R session is currently busy. Wait for completion or " +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ public void execute()
}
};

// do standrd finish if we aren't animating
// do standard finish if we aren't animating
if (!event.shouldAnimate())
{
display.clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private void executePendingAnimatedInput()
{
if (pendingAnimatedInput_.size() > 0)
{
// get the input animaator
// get the input animator
InputAnimator inputAnimator = pendingAnimatedInput_.get(0);

// calculate the period (make sure the command takes no longer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public void goToDefinition()
if (cursor.moveToPosition(editor.getCursorPosition(), true))
{
// if the cursor is 'on' a left bracket, move back to the associated
// token (obstensibly a funciton name)
// token (ostensibly a function name)
if (cursor.isLeftBracket())
cursor.moveToPreviousToken();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ protected Widget createMainWidget()
return objects_;
}

// EnviromentPresenter.Display implementation ------------------------------
// EnvironmentPresenter.Display implementation ------------------------------

@Override
public void addObject(RObject object)
Expand Down Expand Up @@ -401,7 +401,7 @@ public void setViewDirty()
isClientStateDirty_ = true;
}

// EnviromentObjects.Observer implementation -------------------------------
// EnvironmentObjects.Observer implementation -------------------------------

public void setPersistedScrollPosition(int scrollPosition)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void onListChanged(ListChangedEvent event)
final LinkMenu history = view_.getHistory() ;
history.clearLinks();

// intialize from the list
// initialize from the list
ArrayList<String> list = event.getList();
for (int i=0; i<list.size(); i++)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void getHistoryArchiveItems(
/*
* searchHistoryDatabase - search the history archive for the query
* (return up to maxEntries). the search is conducted beginning with the
* most recent history items and returned in index decsending order i.e. newest
* most recent history items and returned in index descending order i.e. newest
* ones first)
*/
void searchHistoryArchive(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public void setPackageStatus(PackageStatus status)

private int packageRow(String packageName, String packageLib)
{
// if we haven't retreived packages yet then return not found
// if we haven't retrieved packages yet then return not found
if (packagesDataProvider_ == null)
return -1;

Expand Down Expand Up @@ -537,7 +537,7 @@ else if (source == "source")
packagesTableContainer_.add(packagesTable_);
layoutPackagesTable();

// unbind old table from data provider incase we've re-generated the pane
// unbind old table from data provider in case we've re-generated the pane
for (HasData<PackageInfo> display : packagesDataProvider_.getDataDisplays())
packagesDataProvider_.removeDataDisplay(display);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public ManipulatorControlSlider(String variable,
double step = slider.getStep();
if (step == -1)
{
// short range or decimals means continous decimal
// short range or decimals means continuous decimal
if (range < 2 || hasDecimals(max) || hasDecimals(min) )
step = range / 250; // ~ one step per pixel
else
Expand Down
Loading

0 comments on commit f019a00

Please sign in to comment.