Skip to content

Commit 033874b

Browse files
committed
v0.29.0
2 parents 3b6c76f + 83192ea commit 033874b

File tree

229 files changed

+2124
-3548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+2124
-3548
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ deps
3333
erl_crash.dump
3434
org.erlide.ui.tests/projects/Erlide_tests (1).launch
3535
buildroot/
36+
coverage.data
37+
coverage.info
38+
coverage.xml
39+
junit.xml

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
jruby-1.7.4
1+
jruby-1.7.9

CHANGES

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
List of user visible changes between 0.28.2 and 0.29.0 (20140623)
2+
3+
25e504f gh189 - stop an erlang shell connected to an external erlang node
4+
ebe85da fix synchronization issue when starting shell
5+
8058d81 handle crashing ide runtimes better
6+
62eb047 fix in jinterface: better exception messages
7+
12ef932 console: copy/paste works now in both fields
8+
e0fdb06 improve multiline handling; still some things depend on scanner fix
9+
a4362ef adjust indentation for concatenated strings
10+
37698cd gh184 gh185 - indentation issues with record/map as first parameter
11+
252c4a3 gh183 - Named fun indentation broken
12+
113
List of user visible changes between 0.28.1 and 0.28.2 (20140512)
214

315
0ac33c7 convert all xtend files to utf-8

org.erlide.backend/META-INF/MANIFEST.MF

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.erlide.backend;singleton:=true
5-
Bundle-Version: 0.24.8.qualifier
5+
Bundle-Version: 0.24.9.qualifier
66
Bundle-ClassPath: .
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin
@@ -21,11 +21,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
2121
org.eclipse.debug.core;bundle-version="3.7.0",
2222
org.eclipse.equinox.event;bundle-version="1.2.0",
2323
org.eclipse.osgi.services;bundle-version="3.3.0",
24-
org.erlide.model.api;bundle-version="0.24.0",
25-
org.erlide.runtime;bundle-version="0.19.0",
26-
org.erlide.util;bundle-version="0.19.0",
27-
org.erlide.util_eclipse;bundle-version="0.19.0",
28-
org.erlide.libs;bundle-version="1.12.0"
24+
org.erlide.model.api,
25+
org.erlide.runtime,
26+
org.erlide.util,
27+
org.erlide.util_eclipse,
28+
org.erlide.libs
2929
Bundle-ActivationPolicy: lazy
3030
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
3131
Eclipse-ExtensibleAPI: true

org.erlide.backend/src/org/erlide/backend/api/BackendData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.erlide.backend.debug.ErlDebugConstants;
3535
import org.erlide.backend.launch.IErlangLaunchDelegateConstants;
3636
import org.erlide.engine.model.IBeamLocator;
37-
import org.erlide.engine.model.erlang.ModuleKind;
37+
import org.erlide.engine.model.erlang.SourceKind;
3838
import org.erlide.runtime.api.ErlDebugFlags;
3939
import org.erlide.runtime.api.ErlRuntimeAttributes;
4040
import org.erlide.runtime.api.InitialCall;
@@ -136,7 +136,7 @@ public static Set<String> addBreakpointProjectsAndModules(
136136
final IMarker m = bp.getMarker();
137137
final IResource r = m.getResource();
138138
final String name = r.getName();
139-
if (ModuleKind.hasErlExtension(name)) {
139+
if (SourceKind.hasErlExtension(name)) {
140140
final IProject p = r.getProject();
141141
if (projects == null || projects.contains(p)) {
142142
final String s = p.getName() + ":" + name;

org.erlide.backend/src/org/erlide/backend/console/BackendShell.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,11 @@ public synchronized void addListener(final BackendShellListener listener) {
222222

223223
private void sendEarlierRequests(final BackendShellListener listener) {
224224
int alength = 0;
225-
for (final IoRequest request : requests) {
226-
listener.changed(makeEvent(alength, request));
227-
alength += request.getLength();
225+
synchronized (requests) {
226+
for (final IoRequest request : requests) {
227+
listener.changed(makeEvent(alength, request));
228+
alength += request.getLength();
229+
}
228230
}
229231
}
230232

org.erlide.backend/src/org/erlide/backend/internal/BackendPlugin.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,6 @@
1212
public class BackendPlugin extends Plugin {
1313

1414
public static final String PLUGIN_ID = "org.erlide.backend";
15-
private static BackendPlugin plugin;
16-
17-
public BackendPlugin() {
18-
super();
19-
plugin = this;
20-
}
21-
22-
public static BackendPlugin getDefault() {
23-
if (plugin == null) {
24-
plugin = new BackendPlugin();
25-
}
26-
return plugin;
27-
}
2815

2916
@Override
3017
public void start(final BundleContext context) throws Exception {
@@ -36,7 +23,7 @@ public void start(final BundleContext context) throws Exception {
3623
final IBackendFactory backendFactory = new BackendFactory(catalog);
3724
final IBackendManager backendManager = new BackendManager(backendFactory);
3825
BackendCore.init(backendManager);
39-
ErlLogger.debug("Backend plugin started " + backendManager);
26+
ErlLogger.debug("Backend plugin started");
4027
}
4128

4229
@Override

org.erlide.backend/src/org/erlide/backend/internal/BeamUtil.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,20 @@ public static void unpackBeamFiles(final Bundle b, final String location) {
159159
final String s = (String) e.nextElement();
160160
final String beamModuleName = BackendUtils.getBeamModuleName(s);
161161
if (beamModuleName != null) {
162-
final URL url = b.getEntry(s);
163162
ErlLogger.debug(" unpack: " + beamModuleName);
164163
final File beam = new File(ebinDir, beamModuleName + ".beam");
165164
try {
166165
beam.createNewFile();
167166
final FileOutputStream fs = new FileOutputStream(beam);
168167
try {
169-
final OtpErlangBinary bin = getBeamBinary(beamModuleName,
170-
url);
171-
fs.write(bin.binaryValue());
168+
final URL url = b.getEntry(s);
169+
if (url != null) {
170+
final OtpErlangBinary bin = getBeamBinary(
171+
beamModuleName, url);
172+
if (bin != null) {
173+
fs.write(bin.binaryValue());
174+
}
175+
}
172176
} finally {
173177
fs.close();
174178
}

org.erlide.backend/src/org/erlide/backend/internal/CodeManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ private void loadCodeForBundle(final CodeContext context, final ICodeBundle bund
111111
final String beamModuleName = BackendUtils.getBeamModuleName(ebinDir);
112112
if (beamModuleName != null) {
113113
// ErlLogger.debug(" load " + beamModuleName);
114-
final boolean ok = loadBeam(beamModuleName,
115-
bundle.getBundle().getEntry(ebinDir));
114+
final URL entry = bundle.getBundle().getEntry(ebinDir);
115+
final boolean ok = entry != null && loadBeam(beamModuleName, entry);
116116
if (!ok) {
117117
ErlLogger.error("Could not load %s", beamModuleName);
118118
}

org.erlide.backend/src/org/erlide/backend/runtimeinfo/RuntimeInfoPreferencesSerializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public class RuntimeInfoPreferencesSerializer implements IRuntimeInfoSerializer
1616

1717
private static final String ERLIDE_KEY = "erlide";
1818
private static final String DEFAULT_KEY = "default";
19+
// FIXME this is kind of an indirect dep on core plugin (needs to be
20+
// started) and this may get called before that
1921
private static String rootKey = "org.erlide.core" + "/runtimes";
2022

2123
public static IEclipsePreferences getInstanceRootNode() {

0 commit comments

Comments
 (0)