Permalink
Browse files

Merge remote-tracking branch 'upstream/pu' into pu

  • Loading branch information...
2 parents 53a8abc + 59b64dd commit 136ed9edd06347297352d47a856c7dbd8b5faab7 @jakobc jakobc committed Feb 4, 2013
Showing with 819 additions and 3,182 deletions.
  1. +4 −4 org.erlide.core/META-INF/MANIFEST.MF
  2. +2 −2 org.erlide.core/src/org/erlide/backend/internal/ErlRuntime.java
  3. +4 −1 org.erlide.core/src/org/erlide/core/internal/model/erlang/ErlideScanner.java
  4. +1 −5 org.erlide.core/src/org/erlide/core/model/root/OldErlangProjectProperties.java
  5. +2 −2 org.erlide.cover.ui/src/org/erlide/cover/ui/views/CoverStatsView.java
  6. +2 −1 org.erlide.cover.ui/src/org/erlide/cover/ui/views/EUnitView.java
  7. +1 −2 org.erlide.help/cheatsheets/tutorial1.xml
  8. +0 −10 org.erlide.help/plugin.xml
  9. +10 −10 org.erlide.kernel.debugger/src/int.erl
  10. +225 −221 org.erlide.kernel.ide/src/erlide_shell.erl
  11. +11 −5 org.erlide.kernel.ide/src/parsing/erlide_noparse.erl
  12. +6 −6 org.erlide.kernel.ide/src/parsing/erlide_open.erl
  13. +4 −3 org.erlide.libs/src/com/ericsson/otp/erlang/AbstractNode.java
  14. +1 −1 org.erlide.libs/src/com/ericsson/otp/erlang/OtpEpmd.java
  15. +2 −2 org.erlide.libs/src/com/ericsson/otp/erlang/OtpErlangAtom.java
  16. +2 −3 org.erlide.libs/src/com/ericsson/otp/erlang/OtpErlangFun.java
  17. +1 −1 org.erlide.libs/src/com/ericsson/otp/erlang/OtpErlangList.java
  18. +4 −4 org.erlide.libs/src/com/ericsson/otp/erlang/OtpErlangTuple.java
  19. +6 −0 org.erlide.libs/src/com/ericsson/otp/erlang/OtpExternal.java
  20. +62 −19 org.erlide.libs/src/com/ericsson/otp/erlang/OtpInputStream.java
  21. +3 −3 org.erlide.libs/src/com/ericsson/otp/erlang/OtpMbox.java
  22. +3 −4 org.erlide.libs/src/com/ericsson/otp/erlang/OtpNode.java
  23. +95 −45 org.erlide.libs/src/com/ericsson/otp/erlang/OtpOutputStream.java
  24. +2 −2 org.erlide.test_support/src/org/erlide/test_support/ui/suites/RegressionResultsView.java
  25. +2 −2 org.erlide.test_support/src/org/erlide/test_support/ui/suites/TestResultsView.java
  26. +2 −1 org.erlide.tracing.core/src/org/erlide/tracing/core/views/ControlPanelView.java
  27. +7 −3 org.erlide.ui.tests/projects/Erlide_tests.launch
  28. +19 −25 org.erlide.ui.tests/projects/bt/.project
  29. +4 −4 org.erlide.ui.tests/projects/bt/.settings/org.erlide.core.prefs
  30. +14 −20 org.erlide.ui.tests/projects/main_prj/.project
  31. +2 −2 org.erlide.ui.tests/projects/p1/.settings/org.erlide.core.prefs
  32. +2 −2 org.erlide.ui.tests/projects/p2/.settings/org.erlide.core.prefs
  33. +3 −3 org.erlide.ui.tests/projects/remote_debug/.settings/org.erlide.core.prefs
  34. +44 −47 org.erlide.ui/src/org/erlide/debug/ui/views/DebuggerTraceView.java
  35. +2 −2 org.erlide.ui/src/org/erlide/ui/console/ConsolePageParticipant.java
  36. +2 −2 org.erlide.ui/src/org/erlide/ui/console/ErlConsoleDocument.java
  37. +2 −2 org.erlide.ui/src/org/erlide/ui/editors/erl/EditorConfiguration.java
  38. +21 −55 org.erlide.ui/src/org/erlide/ui/editors/erl/ErlangEditor.java
  39. +85 −0 org.erlide.ui/src/org/erlide/ui/editors/erl/ErlangSourceViewer.java
  40. +82 −20 ...c/org/erlide/ui/editors/erl/{ErlangEditorBracketInserter.java → ErlangViewerBracketInserter.java}
  41. +9 −0 org.erlide.ui/src/org/erlide/ui/editors/erl/IBracketInserterValidator.java
  42. +3 −3 org.erlide.ui/src/org/erlide/ui/editors/internal/reconciling/ErlReconciler.java
  43. +2 −2 ...erlide/ui/editors/internal/reconciling/{ErlReconcilerStrategy.java → ErlReconcilingStrategy.java}
  44. +2 −2 org.erlide.ui/src/org/erlide/ui/internal/information/OpenEdocInExternalBrowserAction.java
  45. +0 −4 org.erlide.ui/src/org/erlide/ui/navigator/ErlangExternalsContentProvider.java
  46. +1 −3 org.erlide.ui/src/org/erlide/ui/util/BackendManagerPopup.java
  47. +28 −0 org.erlide.ui/src/org/erlide/ui/util/DisplayUtils.java
  48. +10 −14 org.erlide.ui/src/org/erlide/ui/util/ProblemMarkerManager.java
  49. +2 −1 org.erlide.ui/src/org/erlide/ui/util/eclipse/text/HTMLPrinter.java
  50. +2 −2 org.erlide.ui/src/org/erlide/ui/views/EpmdView.java
  51. +12 −16 org.erlide.ui/src/org/erlide/ui/views/eval/LiveExpressionsView.java
  52. +2 −2 org.erlide.ui/src/org/erlide/ui/views/processlist/ProcessListView.java
  53. +0 −7 shade.bterl/.classpath
  54. +0 −28 shade.bterl/.project
  55. +0 −288 shade.bterl/.settings/org.eclipse.jdt.core.prefs
  56. +0 −4 shade.bterl/.settings/org.eclipse.jdt.ui.prefs
  57. +0 −37 shade.bterl/META-INF/MANIFEST.MF
  58. +0 −6 shade.bterl/build.properties
  59. BIN shade.bterl/icons/run_bterl.gif
  60. +0 −211 shade.bterl/plugin.xml
  61. +0 −36 shade.bterl/src/org/erlide/shade/bterl/Activator.java
  62. +0 −62 shade.bterl/src/org/erlide/shade/bterl/builder/ErlTestNature.java
  63. +0 −558 shade.bterl/src/org/erlide/shade/bterl/builder/TestCodeBuilder.java
  64. +0 −85 shade.bterl/src/org/erlide/shade/bterl/builder/ToggleNatureAction.java
  65. +0 −155 shade.bterl/src/org/erlide/shade/bterl/ui/TestRunnableTester.java
  66. +0 −180 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/RegressionLauncher.java
  67. +0 −118 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/ReportFinder.java
  68. +0 −14 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestLaunchAttributes.java
  69. +0 −340 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestLaunchDelegate.java
  70. +0 −203 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestLaunchShortcut.java
  71. +0 −22 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestLaunchShortcutCover.java
  72. +0 −60 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestLaunchShortcutRegression.java
  73. +0 −53 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestLaunchShortcutRun.java
  74. +0 −29 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestLaunchShortcutTrace.java
  75. +0 −37 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestRegressionLaunchDelegate.java
  76. +0 −54 shade.bterl/src/org/erlide/shade/bterl/ui/launcher/TestsBeamLocator.java
@@ -9,13 +9,13 @@ Bundle-Localization: plugin
Export-Package: org.erlide.backend,
org.erlide.backend.console,
org.erlide.backend.events,
- org.erlide.backend.internal;x-friends:="org.erlide.ui,shade.bterl",
+ org.erlide.backend.internal;x-friends:="org.erlide.ui",
org.erlide.backend.runtimeinfo,
org.erlide.core,
org.erlide.core.content,
- org.erlide.core.internal.model.erlang;x-friends:="org.erlide.tracing.core,org.erlide.ui,shade.bterl",
- org.erlide.core.internal.model.root;x-friends:="org.erlide.tracing.core,org.erlide.ui,shade.bterl",
- org.erlide.core.internal.services.builder;x-friends:="shade.bterl",
+ org.erlide.core.internal.model.erlang;x-friends:="org.erlide.tracing.core,org.erlide.ui",
+ org.erlide.core.internal.model.root;x-friends:="org.erlide.tracing.core,org.erlide.ui",
+ org.erlide.core.internal.services.builder,
org.erlide.core.model,
org.erlide.core.model.erlang,
org.erlide.core.model.root,
@@ -50,9 +50,9 @@
setDefaultTimeout();
}
- private static final int MAX_RETRIES = 10;
+ private static final int MAX_RETRIES = 15;
public static final int RETRY_DELAY = Integer.parseInt(System.getProperty(
- "erlide.connect.delay", "300"));
+ "erlide.connect.delay", "400"));
private static final Object connectLock = new Object();
private static final RpcHelper rpcHelper = RpcHelper.getInstance();
@@ -113,7 +113,7 @@ public static ErlToken getTokenAt(final String module, final int offset) {
@SuppressWarnings("boxing")
public static void replaceText(final String module, final int offset,
- final int removeLength, final String newText) {
+ final int removeLength, String newText) {
final IBackend backend = BackendCore.getBackendManager()
.getIdeBackend();
try {
@@ -122,6 +122,9 @@ public static void replaceText(final String module, final int offset,
// removeLength, newTextLen);
// ErlLogger.debug("replaceText %s %d %d \"%s\"", module, offset,
// removeLength, newText);
+ if (newText == null) {
+ newText = "";
+ }
final OtpErlangObject r = backend.getRpcSite().call(ERLIDE_SCANNER,
"replaceText", "aiis", module, offset, removeLength,
newText);
@@ -241,11 +241,7 @@ public String getExternalModulesFile() {
public RuntimeInfo getRuntimeInfo() {
final RuntimeInfo runtime = BackendCore.getRuntimeInfoCatalog()
.getRuntime(runtimeVersion, runtimeName);
- RuntimeInfo rt = null;
- if (runtime != null) {
- rt = RuntimeInfo.copy(runtime);
- }
- return rt;
+ return runtime;
}
public RuntimeVersion getRuntimeVersion() {
@@ -19,7 +19,6 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
@@ -49,6 +48,7 @@
import org.erlide.cover.ui.views.helpers.StatsViewLabelProvider;
import org.erlide.cover.views.model.ICoverageObject;
import org.erlide.cover.views.model.StatsTreeModel;
+import org.erlide.ui.util.DisplayUtils;
/**
* View for coverage statistics
@@ -371,7 +371,7 @@ public void eventOccured(final ICoverEvent e) {
switch (e.getType()) {
case UPDATE:
- Display.getDefault().asyncExec(new Runnable() {
+ DisplayUtils.asyncExec(new Runnable() {
@Override
public void run() {
viewer.refresh();
@@ -15,6 +15,7 @@
import org.erlide.cover.ui.views.helpers.TestViewContentProvider;
import org.erlide.cover.ui.views.helpers.TestViewLabelProvider;
import org.erlide.cover.views.model.TestTreeModel;
+import org.erlide.ui.util.DisplayUtils;
/**
* Simple view to show EUnit test results
@@ -74,7 +75,7 @@ public void setFocus() {
@Override
public void treeChanged() {
- Display.getDefault().asyncExec(new Runnable() {
+ DisplayUtils.asyncExec(new Runnable() {
@Override
public void run() {
viewer.refresh();
@@ -7,14 +7,13 @@
Thanks to <b>Eli Liang</b> for writing this guide.
<br/>
-If you can read this cheatsheet, it means you managed to install erlide, wich is a great first step! :-)e, wich is a great first step! :-) erlide, wich is a great first step! :-) a great first step! :-)ged to install erlide, wich is a great first step! :-)
</description>
</intro>
<item
title="Configure the Erlang runtime">
<description>
Configure the Erlang runtime on the X-&gt;Workbench icon on the right side of the main eclipse window.
-Select <b>Window &gt; Open Perspective &gt; Java</b> in </description>
+Select <b>Window &gt; Open Perspective &gt; Java</b> in
</item>
</cheatsheet>
View
@@ -12,16 +12,6 @@
id="org.erlide.help.cheatsheet.erlang"
name="Erlang cheatsheets">
</category>
- <cheatsheet
- category="org.erlide.help.cheatsheet.erlang"
- composite="false"
- contentFile="$nl$/cheatsheets/tutorial1.xml"
- id="org.erlide.help.cheatsheet1152782932"
- name="Quick start">
- <description>
- Quick start
- </description>
- </cheatsheet>
</extension>
</plugin>
@@ -1,7 +1,7 @@
%% Author: jakob
%% Created: 21 aug 2008
-module(int).
--author(jakobce@gmail.com).
+-author('jakobce@gmail.com').
%% TODO Since the error_handler (in R12 and earlier) hard-codes the int
%% module, we replace it to call erlide_int
@@ -16,11 +16,11 @@
%%
-export([i/1, ni/1, n/1, nn/1, interpreted/0, file/1,
- interpretable/1, auto_attach/0, auto_attach/1, auto_attach/2,
- stack_trace/0, stack_trace/1, break/2, delete_break/2, break_in/3,
- del_break_in/3, no_break/0, no_break/1, disable_break/2, enable_break/2,
- action_at_break/3, test_at_break/3, get_binding/2,
- all_breaks/0, all_breaks/1, snapshot/0, clear/0, continue/1, continue/3]).
+ interpretable/1, auto_attach/0, auto_attach/1, auto_attach/2,
+ stack_trace/0, stack_trace/1, break/2, delete_break/2, break_in/3,
+ del_break_in/3, no_break/0, no_break/1, disable_break/2, enable_break/2,
+ action_at_break/3, test_at_break/3, get_binding/2,
+ all_breaks/0, all_breaks/1, snapshot/0, clear/0, continue/1, continue/3]).
%%
%% Internal Export
@@ -31,8 +31,8 @@
%% API Functions
%%
-eval(Mod, Func, Args) ->
- erlide_int:eval(Mod, Func, Args).
+eval(Mod, Func, Args) ->
+ erlide_int:eval(Mod, Func, Args).
%%
%% Local Functions
@@ -68,8 +68,8 @@ clear() -> nyi(clear).
continue(Pid) -> erlide_int:continue(Pid).
continue(X, Y, Z) -> erlide_int:continue(X, Y, Z).
-nyi(F) ->
- io:format("function ~p unavailable from within ErlIDE, use Eclipse debugger functions instead\n", [F]),
+nyi(F) ->
+ io:format("function ~p unavailable from within ErlIDE, use Eclipse debugger functions instead\n", [F]),
{error, unavaible}.
Oops, something went wrong.

0 comments on commit 136ed9e

Please sign in to comment.